From e4330341bd648e93b60fe70c631e311a98bce549 Mon Sep 17 00:00:00 2001 From: Tim Ruffing Date: Sat, 28 Jan 2023 09:22:24 +0100 Subject: [PATCH] ci: Shutdown wineserver whenever CI script exits Before: CI times out when a wine task fails. After: Wine tasks exit properly when they fail. --- ci/cirrus.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ci/cirrus.sh b/ci/cirrus.sh index e1ca35e3e32c0..8495c39203fdf 100755 --- a/ci/cirrus.sh +++ b/ci/cirrus.sh @@ -34,6 +34,8 @@ print_environment # This speeds up jobs with many invocations of wine (e.g., ./configure with MSVC) tremendously. case "$WRAPPER_CMD" in *wine*) + # Make sure to shutdown wineserver whenever we exit. + trap "wineserver -k || true" EXIT INT HUP # This is apparently only reliable when we run a dummy command such as "hh.exe" afterwards. wineserver -p && wine hh.exe ;; @@ -111,9 +113,6 @@ then make precomp fi -# Shutdown wineserver again -wineserver -k || true - # Check that no repo files have been modified by the build. # (This fails for example if the precomp files need to be updated in the repo.) git diff --exit-code