From: bones_was_here <bones_was_here@xonotic.au>
Date: Mon, 13 Mar 2023 17:48:51 +0000 (+1000)
Subject: fix pipeline: use a more stable version of stormkeep
X-Git-Tag: xonotic-v0.8.6~151
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=db7228d3abe65efc7ca138f74d4582e6ca879d7e;p=xonotic%2Fxonotic-data.pk3dir.git

fix pipeline: use a more stable version of stormkeep
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 148a8bd47..887b0691e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -64,7 +64,13 @@ test_sv_game:
     - diff notifications.cfg data/data/notifications_dump.cfg ||
         { echo 'Please update notifications.cfg using `dumpnotifs`!'; exit 1; }
 
-    - wget -nv -O data/stormkeep.pk3 http://beta.xonotic.org/autobuild-bsp/latest/stormkeep.pk3
+#    - wget -nv -O data/stormkeep.pk3 http://beta.xonotic.org/autobuild-bsp/latest/stormkeep.pk3
+# ^^ INCORRECT: /latest/stormkeep.pk3 is the most recently built, not necessarily the one built from master!
+# we can't get the one from master directly as there's no /stable/stormkeep.pk3 or /master/stormkeep.pk3
+# and we can't run misc/tools/xonotic-map-compiler-autobuild as it uses commit hashes from xonotic-maps.pk3dir to generate filenames
+# but the autobuild server can run it and provide us the resulting pk3:
+    - wget -nv -O data/stormkeep.pk3 https://beta.xonotic.org/pipeline-bin/stormkeep.pk3
+# see also: misc/infrastructure/xonotic-release-build.cron
     - wget -nv -O data/maps/stormkeep.mapinfo https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.mapinfo
     - 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