Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 50b1e8c

Browse files
committed
ci: windows: Use CIRRUS_ESCAPING_PROCESSES, revert 770011e.
cirrus-ci now defaults to killing processes still running at the end of a script. Unfortunately we start postgres in the background, which seems nontrivial to fix. Previously we worked around that in 770011e by using an older agent version, but now that CIRRUS_ESCAPING_PROCESSES we should use that. This reverts commit 770011e "ci: windows: Work around cirrus-ci bug causing test failures. Discussion: https://postgr.es/m/CA+hUKGKx7k14n2nAALSvv6M_AB6oHasNBA65X6Dvo8hwfi9y0A@mail.gmail.com
1 parent a1fc506 commit 50b1e8c

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

.cirrus.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -375,11 +375,12 @@ task:
375375
# "suites".
376376
T_C: "\"C:/Program Files/Git/usr/bin/timeout.exe\" -v -k60s 15m"
377377

378-
# Temporarily work around cirrus-ci bug causing processes started from a
379-
# script to be killed, even if intentionally running in background. See
380-
# https://github.com/cirruslabs/cirrus-ci-agent/issues/218
381-
# https://postgr.es/m/CA%2BhUKGKx7k14n2nAALSvv6M_AB6oHasNBA65X6Dvo8hwfi9y0A%40mail.gmail.com
382-
CIRRUS_AGENT_VERSION: 1.73.2
378+
# startcreate_script starts a postgres instance that we don't want to get
379+
# killed at the end of that script (it's stopped in stop_script). Can't
380+
# trivially use background_scripts because a) need pg_ctl's dropping of
381+
# permissions b) need to wait for startup to have finished, and we don't
382+
# currently have a tool for that...
383+
CIRRUS_ESCAPING_PROCESSES: 1
383384

384385
only_if: $CIRRUS_CHANGE_MESSAGE !=~ '.*\nci-os-only:.*' || $CIRRUS_CHANGE_MESSAGE =~ '.*\nci-os-only:[^\n]*windows.*'
385386

0 commit comments

Comments
 (0)