git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a1fc506)
ci: windows: Use CIRRUS_ESCAPING_PROCESSES, revert 770011e3f39.
2022年3月19日 18:32:18 +0000 (11:32 -0700)
2022年3月19日 18:42:22 +0000 (11:42 -0700)
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 770011e3f39 by using an
older agent version, but now that CIRRUS_ESCAPING_PROCESSES we should use that.

This reverts commit 770011e3f39f21f2095d3a044b72460c4efac345 "ci: windows:
Work around cirrus-ci bug causing test failures.

Discussion: https://postgr.es/m/CA+hUKGKx7k14n2nAALSvv6M_AB6oHasNBA65X6Dvo8hwfi9y0A@mail.gmail.com


diff --git a/.cirrus.yml b/.cirrus.yml
index 6929a0d65aad84177c52d683a6a48c1e5913ab26..e5335fede761af2bbfd6c1a05eaae2d130e42022 100644 (file)
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -375,11 +375,12 @@ task:
# "suites".
T_C: "\"C:/Program Files/Git/usr/bin/timeout.exe\" -v -k60s 15m"
- # Temporarily work around cirrus-ci bug causing processes started from a
- # script to be killed, even if intentionally running in background. See
- # https://github.com/cirruslabs/cirrus-ci-agent/issues/218
- # https://postgr.es/m/CA%2BhUKGKx7k14n2nAALSvv6M_AB6oHasNBA65X6Dvo8hwfi9y0A%40mail.gmail.com
- CIRRUS_AGENT_VERSION: 1.73.2
+ # startcreate_script starts a postgres instance that we don't want to get
+ # killed at the end of that script (it's stopped in stop_script). Can't
+ # trivially use background_scripts because a) need pg_ctl's dropping of
+ # permissions b) need to wait for startup to have finished, and we don't
+ # currently have a tool for that...
+ CIRRUS_ESCAPING_PROCESSES: 1
only_if: $CIRRUS_CHANGE_MESSAGE !=~ '.*\nci-os-only:.*' || $CIRRUS_CHANGE_MESSAGE =~ '.*\nci-os-only:[^\n]*windows.*'
This is the main PostgreSQL git repository.
RSS Atom

AltStyle によって変換されたページ (->オリジナル) /