pipeline: optimise builds and stop ASAP if any fail

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 50aee9dcb72fde803bfcae0c6e9462253ae6e45e..464693215efe6c7931e4653215204647ed08ac85 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,9 +7,14 @@ workflow:
 before_script:\r
   - ln -s $PWD data/xonotic-data.pk3dir\r
 \r
+  - export MAKEFLAGS=-j$(nproc); echo MAKEFLAGS=$MAKEFLAGS\r
+#   FIXME: -march=native -mtune=native _changes the hash_, why?!?\r
+# - 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
-  - cd gmqcc && make -j $(nproc) && export QCC="$PWD/gmqcc"\r
-  - cd ..\r
+  - make -C gmqcc || exit 1\r
+  - export QCC="$PWD/gmqcc/gmqcc"\r
 \r
 test_compilation_units:\r
   rules:\r
@@ -23,22 +28,22 @@ test_sv_game:
   stage: test\r
   script:\r
     - git clone --depth=1 --branch=div0-stable https://gitlab.com/xonotic/darkplaces.git darkplaces\r
-    - cd darkplaces && make sv-debug -j $(nproc) && export ENGINE="$PWD/darkplaces-dedicated -xonotic"\r
-    - cd ..\r
+    - make -C darkplaces sv-release || exit 1\r
+    - export ENGINE="$PWD/darkplaces/darkplaces-dedicated -xonotic -noconfig -nohome"\r
+    - make qc || exit 1\r
 \r
     - mkdir -p data/maps\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
-    - make\r
 \r
-    - $ENGINE -noconfig -nohome +map stormkeep +dumpnotifs +wait +quit\r
+    - ${ENGINE} +map stormkeep +dumpnotifs +wait +quit\r
     - diff notifications.cfg data/data/notifications_dump.cfg ||\r
         { echo 'Please update notifications.cfg using `dumpnotifs`!'; exit 1; }\r
 \r
     - EXPECT=d4060caf37a2e60bab68d1f83bc57368\r
-    - HASH=$(${ENGINE} -noconfig -nohome +timestamps 1 +exec serverbench.cfg\r
+    - HASH=$(${ENGINE} +timestamps 1 +exec serverbench.cfg\r
       | tee /dev/stderr\r
       | sed -e 's,^\[[^]]*\] ,,'\r
       | grep '^:'\r
@@ -54,11 +59,11 @@ test_sv_unit:
   stage: test\r
   script:\r
     - git clone --depth=1 --branch=div0-stable https://gitlab.com/xonotic/darkplaces.git darkplaces\r
-    - cd darkplaces && make sv-debug -j $(nproc) && export ENGINE="$PWD/darkplaces-dedicated -xonotic"\r
-    - cd ..\r
+    - cd darkplaces && make sv-release || exit 1\r
+    - export ENGINE="$PWD/darkplaces-dedicated -xonotic" && cd ..\r
+    - make qc || exit 1\r
 \r
     - mkdir maps && wget -O maps/gitlab-ci.bsp https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/_init/_init.bsp\r
-    - make\r
     - while read line; do\r
         echo $line;\r
         if [[ $line == "All tests OK" ]]; then exit 0; fi;\r