From: drjaska <drjaska83@gmail.com>
Date: Tue, 22 Aug 2023 02:20:59 +0000 (+0300)
Subject: Merge branch 'master' into drjaska/spread-pattern
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=df1c66fad46978ec3bbc612378eef6adf162adca;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into drjaska/spread-pattern
---

df1c66fad46978ec3bbc612378eef6adf162adca
diff --cc .gitlab-ci.yml
index 5a3c7e770,fcb8cfbe0..ccb5e477a
--- 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=62e1bd236de4e5be1195c63290d7fe81
-     - HASH=$(${ENGINE} +timestamps 1 +exec serverbench.cfg
 -    - EXPECT=27f38dfbbd72e4bf8f9b540882d5ccbe
++    - EXPECT=5077d03a22e17ce1b27b4401206beb95
+     - HASH=$(${ENGINE} +exec serverbench.cfg
        | tee /dev/stderr
-       | sed -e 's,^\[[^]]*\] ,,'
        | grep '^:'
        | grep -v '^:gamestart:'
        | grep -v '^:anticheat:'