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

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

1b9c5a52099d847b13289e56be9e7888c9e03607
diff --cc .gitlab-ci.yml
index edb153ac4,478613507..f2334ef66
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -75,7 -75,7 +75,7 @@@ 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=2e2290a8780a78ea6238a7b3d1386e39
 -    - EXPECT=f2226bf353b6ff3dd3c489a742ce4e6a
++    - EXPECT=837de85eaf3bb3f9e853fa3de5b3b4af
      - HASH=$(${ENGINE} +timestamps 1 +exec serverbench.cfg
        | tee /dev/stderr
        | sed -e 's,^\[[^]]*\] ,,'