Skip to content

Commit

Permalink
ci: Shutdown wineserver whenever CI script exits
Browse files Browse the repository at this point in the history
Before: CI times out when a wine task fails.
After:  Wine tasks exit properly when they fail.
  • Loading branch information
real-or-random committed Feb 6, 2023
1 parent 9a5a611 commit e433034
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions ci/cirrus.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
;;
Expand Down Expand Up @@ -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

0 comments on commit e433034

Please sign in to comment.