From 08c60370e7f0d916d7c636c8941c23c096373bcf Mon Sep 17 00:00:00 2001 From: bones_was_here Date: Fri, 13 Sep 2024 16:23:38 +1000 Subject: [PATCH] pipeline: update hash for stormkeep changes, prevent potential flakiness I have isolated the cause of the hash change to https://gitlab.com/xonotic/xonotic-maps.pk3dir/-/merge_requests/191 (only change needed to restore the previous hash is using stormkeep from the previous autobuild 20240906_2). DP uses nonblocking stdout on Linux by default, in theory this could cause occasional pipeline failures that can't be reproduced. --- .gitlab-ci.yml | 2 +- qcsrc/tools/sv_game-hashtest.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d96b58c55..3d2d310a0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,7 +36,7 @@ test_compilation_units: test_sv_game: stage: test script: - - export EXPECT=28a49dd762a7a794f210eeadbbc37a8e + - export EXPECT=82b429be1301d38fbe0af0c60511ceed - qcsrc/tools/sv_game-hashtest.sh - exit $? diff --git a/qcsrc/tools/sv_game-hashtest.sh b/qcsrc/tools/sv_game-hashtest.sh index 2f8c3dd6c..d687af1dc 100755 --- a/qcsrc/tools/sv_game-hashtest.sh +++ b/qcsrc/tools/sv_game-hashtest.sh @@ -172,7 +172,7 @@ else fi fi fi -export ENGINE="$ENGINE -noconfig -nohome" +export ENGINE="$ENGINE -noconfig -nohome +sys_stdout_blocks 1" make qc || exit 1 -- 2.39.2