]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0dec4c1)
pipeline: update hash for stormkeep changes, prevent potential flakiness
authorbones_was_here <bones_was_here@xonotic.au>
Fri, 13 Sep 2024 06:23:38 +0000 (16:23 +1000)
committerbones_was_here <bones_was_here@xonotic.au>
Fri, 13 Sep 2024 06:32:06 +0000 (16:32 +1000)
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 patch | blob | history
qcsrc/tools/sv_game-hashtest.sh patch | blob | history

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d96b58c55e4f71de6d2335ba10d1c94fb4f13af6..3d2d310a028d30ddfd0dc7722d5af104bc25c70f 100644 (file)
--- 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 2f8c3dd6c387120d2cb60bc011ee734d2fed37af..d687af1dce442cfdfb780008d06e78b78ec4165b 100755 (executable)
--- 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