From: bones_was_here <bones_was_here@xonotic.au>
Date: Thu, 25 May 2023 07:59:22 +0000 (+1000)
Subject: Merge remote-tracking branch 'origin/master' into pending-release
X-Git-Tag: xonotic-v0.8.6~56^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ba31505bf99508796cc102e4c7a6001effb07b50;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/master' into pending-release
---

ba31505bf99508796cc102e4c7a6001effb07b50
diff --cc .gitlab-ci.yml
index 5d850785d,b56f2b44d..61a2cfef5
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -75,10 -75,9 +75,9 @@@ test_sv_game
      - wget -nv -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints
      - wget -nv -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache
  
 -    - EXPECT=f2226bf353b6ff3dd3c489a742ce4e6a
 +    - EXPECT=e7c012825007ed251efa4e52dfbb592e
-     - HASH=$(${ENGINE} +timestamps 1 +exec serverbench.cfg
+     - HASH=$(${ENGINE} +exec serverbench.cfg
        | tee /dev/stderr
-       | sed -e 's,^\[[^]]*\] ,,'
        | grep '^:'
        | grep -v '^:gamestart:'
        | grep -v '^:anticheat:'