From: bones_was_here <bones_was_here@xonotic.au>
Date: Mon, 28 Nov 2022 20:34:03 +0000 (+1000)
Subject: pipeline: attempt to skip DP build by downloading from beta.xonotic.org and make... 
X-Git-Tag: xonotic-v0.8.6~283
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=01604e5c7bb1fb561930e54b6ea5bd23460c0de9;p=xonotic%2Fxonotic-data.pk3dir.git

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

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