Fix compilation unit test derp

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 77155987c6d5628c03ba16f706f6c98a2ef97e25..31378d8d25d85d6432a5b73209a2b11fc88127c1 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,9 +12,15 @@ before_script:
 # - export CC="gcc -pipe -march=native -mtune=native"\r
   - export CC="gcc -pipe"\r
 \r
-  - git clone --depth=1 --branch=main https://gitlab.com/xonotic/gmqcc.git gmqcc\r
-  - make -C gmqcc || exit 1\r
-  - export QCC="$PWD/gmqcc/gmqcc"\r
+  - >\r
+    if wget -nv https://beta.xonotic.org/pipeline-bin/gmqcc ; then\r
+      export QCC="$PWD/gmqcc"\r
+      chmod +x "$QCC"\r
+    else\r
+      git clone --depth=1 --branch=main https://gitlab.com/xonotic/gmqcc.git gmqcc\r
+      make -C gmqcc || exit 1\r
+      export QCC="$PWD/gmqcc/gmqcc"\r
+    fi\r
 \r
   # Makefile: don't complain about lack of tags (fetching them is slow)\r
   - export QCCFLAGS_WATERMARK=gitlab_pipeline\r
@@ -33,7 +39,7 @@ test_sv_game:
   stage: test\r
   script:\r
     - >\r
-      if wget -nv https://beta.xonotic.org/autobuild-rsync/Xonotic/xonotic-linux64-dedicated ; then\r
+      if wget -nv https://beta.xonotic.org/pipeline-bin/xonotic-linux64-dedicated ; then\r
         export ENGINE="$PWD/xonotic-linux64-dedicated"\r
         chmod +x "$ENGINE"\r
       else\r
@@ -46,15 +52,15 @@ test_sv_game:
     - make qc || exit 1\r
 \r
     - mkdir -p data/maps\r
-    - wget -nv -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/_init.bsp https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/_init/_init.bsp\r
 \r
     - while read LINE; do\r
         echo $LINE;\r
         [ "$LINE" = "All tests OK" ] && PASS=1;\r
-      done < <(${ENGINE} +developer 1 +map gitlab-ci +sv_cmd runtest +wait +quit)\r
+      done < <(${ENGINE} +developer 1 +map _init +sv_cmd runtest +wait +quit)\r
     - test "$PASS" = "1" || { echo 'sv_cmd runtest failed!'; exit 1; }\r
 \r
-    - ${ENGINE} +map gitlab-ci +sv_cmd dumpnotifs +wait +quit\r
+    - ${ENGINE} +map _init +sv_cmd dumpnotifs +wait +quit\r
     - diff notifications.cfg data/data/notifications_dump.cfg ||\r
         { echo 'Please update notifications.cfg using `dumpnotifs`!'; exit 1; }\r
 \r
@@ -63,7 +69,7 @@ test_sv_game:
     - 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
+    - EXPECT=8fb740a3cb3754ca7b9295ddc5c911b5\r
     - HASH=$(${ENGINE} +timestamps 1 +exec serverbench.cfg\r
       | tee /dev/stderr\r
       | sed -e 's,^\[[^]]*\] ,,'\r