pipeline: attempt to skip DP build by downloading from beta.xonotic.org and make...

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fa6d92d5bad3adb508d8cbba35e6919668560ec2..77155987c6d5628c03ba16f706f6c98a2ef97e25 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,13 +32,21 @@ test_compilation_units:
 test_sv_game:\r
   stage: test\r
   script:\r
-    - git clone --depth=1 --branch=div0-stable https://gitlab.com/xonotic/darkplaces.git darkplaces\r
-    - make -C darkplaces sv-release || exit 1\r
-    - export ENGINE="$PWD/darkplaces/darkplaces-dedicated -xonotic -noconfig -nohome"\r
+    - >\r
+      if wget -nv https://beta.xonotic.org/autobuild-rsync/Xonotic/xonotic-linux64-dedicated ; then\r
+        export ENGINE="$PWD/xonotic-linux64-dedicated"\r
+        chmod +x "$ENGINE"\r
+      else\r
+        git clone --depth=1 --branch=div0-stable https://gitlab.com/xonotic/darkplaces.git darkplaces\r
+        make -C darkplaces sv-release || exit 1\r
+        export ENGINE="$PWD/darkplaces/darkplaces-dedicated -xonotic"\r
+      fi\r
+    - export ENGINE="$ENGINE -noconfig -nohome"\r
+\r
     - make qc || exit 1\r
 \r
     - mkdir -p data/maps\r
-    - wget -O data/maps/gitlab-ci.bsp https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/_init/_init.bsp\r
+    - wget -nv -O data/maps/gitlab-ci.bsp https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/_init/_init.bsp\r
 \r
     - while read LINE; do\r
         echo $LINE;\r
@@ -50,10 +58,10 @@ test_sv_game:
     - diff notifications.cfg data/data/notifications_dump.cfg ||\r
         { echo 'Please update notifications.cfg using `dumpnotifs`!'; exit 1; }\r
 \r
-    - wget -O data/stormkeep.pk3 http://beta.xonotic.org/autobuild-bsp/latest/stormkeep.pk3\r
-    - wget -O data/maps/stormkeep.mapinfo https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.mapinfo\r
-    - wget -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints\r
-    - wget -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache\r
+    - wget -nv -O data/stormkeep.pk3 http://beta.xonotic.org/autobuild-bsp/latest/stormkeep.pk3\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=4c834aa9b5950ffe25deec1880f21641\r
     - HASH=$(${ENGINE} +timestamps 1 +exec serverbench.cfg\r