From: Juhu <5894800-Juhu_@users.noreply.gitlab.com>
Date: Fri, 1 Jul 2022 00:51:52 +0000 (+0200)
Subject: Merge branch 'master' into Juhu/scoreboard-strafe
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4b66e1d2527de465224bd85af61fe770b2d94ad3;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Juhu/scoreboard-strafe
---

4b66e1d2527de465224bd85af61fe770b2d94ad3
diff --cc .gitlab-ci.yml
index b92272292,8b56b81ff..93ddc4381
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -31,9 -54,9 +54,9 @@@ test_sv_game
      - wget -O data/maps/stormkeep.mapinfo https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.mapinfo
      - wget -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints
      - wget -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache
-     - make
-     - EXPECT=028dcf7335482c5bf83e4a8835f2d66b
-     - HASH=$(${ENGINE} -noconfig -nohome +timestamps 1 +exec serverbench.cfg
+ 
 -    - EXPECT=8e36763a3b4590356bcc449b2452d0ea
++    - EXPECT=38f7947d353ec3645e90baefac3d180e
+     - HASH=$(${ENGINE} +timestamps 1 +exec serverbench.cfg
        | tee /dev/stderr
        | sed -e 's,^\[[^]]*\] ,,'
        | grep '^:'