keepaway: reduce ball force scaling

[xonotic/xonotic-data.pk3dir.git] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 148a8bd47658f7a71e7b1f932436c290690e6ad8..b56f2b44d1b4b126e5b11f3be048aa75e21feaca 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -64,15 +64,20 @@ test_sv_game:
     - diff notifications.cfg data/data/notifications_dump.cfg ||\r
         { echo 'Please update notifications.cfg using `dumpnotifs`!'; exit 1; }\r
 \r
-    - wget -nv -O data/stormkeep.pk3 http://beta.xonotic.org/autobuild-bsp/latest/stormkeep.pk3\r
+#    - wget -nv -O data/stormkeep.pk3 http://beta.xonotic.org/autobuild-bsp/latest/stormkeep.pk3\r
+# ^^ INCORRECT: /latest/stormkeep.pk3 is the most recently built, not necessarily the one built from master!\r
+# we can't get the one from master directly as there's no /stable/stormkeep.pk3 or /master/stormkeep.pk3\r
+# and we can't run misc/tools/xonotic-map-compiler-autobuild as it uses commit hashes from xonotic-maps.pk3dir to generate filenames\r
+# but the autobuild server can run it and provide us the resulting pk3:\r
+    - wget -nv -O data/stormkeep.pk3 https://beta.xonotic.org/pipeline-bin/stormkeep.pk3\r
+# see also: misc/infrastructure/xonotic-release-build.cron\r
     - wget -nv -O data/maps/stormkeep.mapinfo https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.mapinfo\r
     - wget -nv -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints\r
     - wget -nv -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache\r
 \r
-    - EXPECT=55338fabce73c671336171e6cb055f74\r
-    - HASH=$(${ENGINE} +timestamps 1 +exec serverbench.cfg\r
+    - EXPECT=f2226bf353b6ff3dd3c489a742ce4e6a\r
+    - HASH=$(${ENGINE} +exec serverbench.cfg\r
       | tee /dev/stderr\r
-      | sed -e 's,^\[[^]]*\] ,,'\r
       | grep '^:'\r
       | grep -v '^:gamestart:'\r
       | grep -v '^:anticheat:'\r