Merge branch 'bones_was_here/pipeline' into 'master'

gitlab CI pipeline optimisations

See merge request xonotic/xonotic-data.pk3dir!988

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8818e7d163aad5bfdf09d1a8f48f7202317eda51..b5a763f2cd1e923f626cdedf3be7204534ef531b 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,9 +7,19 @@ 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
+  # Makefile: don't complain about lack of tags (fetching them is slow)\r
+  - export QCCFLAGS_WATERMARK=gitlab_pipeline\r
+  # Makefile: don't compress anything or complain about lack of zip program\r
+  - export ZIP=/bin/true\r
 \r
 test_compilation_units:\r
   rules:\r
@@ -17,23 +27,36 @@ test_compilation_units:
       - qcsrc/**/*\r
   stage: test\r
   script:\r
-    - ./qcsrc/tools/compilationunits.sh\r
+    - make test\r
 \r
 test_sv_game:\r
   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/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
+        [ "$LINE" = "All tests OK" ] && PASS=1;\r
+      done < <(${ENGINE} +developer 1 +map gitlab-ci +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
+    - 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
-    - make\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
@@ -45,20 +68,6 @@ test_sv_game:
     - test "$HASH" == "$EXPECT"\r
     - exit $?\r
 \r
-test_sv_unit:\r
-  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
-\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
-      done < <(${ENGINE} +developer 1 +map gitlab-ci +sv_cmd runtest +exit)\r
-    - exit 1\r
 \r
 # NOTE: The generated docs are incomplete - they don't contain code behind SVQC CSQC MENUQC GAMEQC ifdefs.\r
 # With them added to PREDEFINED, it would take over half an hour to generate the docs and even then\r

diff --git a/Makefile b/Makefile
index ab7fa6c1b79fb076e17a833941af341c0d009d08..9ba235e48d70325d9535cbedb1454755ae52dc67 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -23,13 +23,13 @@ qc: check-cvars
 .PHONY: skin
 skin: gfx/menu/default/skinvalues.txt
 
+gfx/menu/default/skinvalues.txt: qcsrc/menu/skin-customizables.inc
+       $(PERL) qcsrc/menu/skin-customizables.inc > gfx/menu/default/skinvalues.txt
+
 .PHONY: clean
 clean:
        $(MAKE) -C qcsrc clean
 
-gfx/menu/default/skinvalues.txt: qcsrc/menu/skin-customizables.inc
-       $(PERL) qcsrc/menu/skin-customizables.inc > gfx/menu/default/skinvalues.txt
-
 .PHONY: sv
 sv:
        $(MAKE) -C qcsrc sv
@@ -37,3 +37,7 @@ sv:
 .PHONY: pk3
 pk3:
        $(MAKE) -C qcsrc pk3
+
+.PHONY: test
+test:
+       $(MAKE) -C qcsrc test

diff --git a/qcsrc/Makefile b/qcsrc/Makefile
index f562bd4f69ea3b84651e6ae042fb27a9234b56e9..ee9e7e64ab9c6e6016fd362b3e2faca5a801b369 100644 (file)
--- a/qcsrc/Makefile
+++ b/qcsrc/Makefile
@@ -81,6 +81,7 @@ clean: | $(WORKDIR)
        $(RM) $(WORKDIR)/qccversion.*
        $(RM) $(WORKDIR)/csprogs-*
        $(RM) $(WORKDIR)/autoexec/csprogs-*.cfg
+       $(RM) $(WORKDIR)/*.dat
        $(RM) csprogs-*.pk3
 
 .PHONY: qc
@@ -94,6 +95,12 @@ pk3: csprogs-$(VER).pk3
 
 
 
+COMPTESTS = test-server test-client test-menu
+.PHONY: test $(COMPTESTS)
+test: $(COMPTESTS)
+$(COMPTESTS):
+       tools/compilationunits.sh $@
+
 
 
 %-$(VER).pk3: $(PROGS_OUT)/%.dat

diff --git a/qcsrc/server/antilag.qc b/qcsrc/server/antilag.qc
index b57627963c48c547ddd9b1c6e0e934562a88be6c..858e0ef8b152b433b6e92c896953cfe648f65801 100644 (file)
--- a/qcsrc/server/antilag.qc
+++ b/qcsrc/server/antilag.qc
@@ -20,10 +20,10 @@ const int ANTILAG_MAX_ORIGINS = 64;
 
 void antilag_record(entity e, entity store, float t)
 {
-    if (e.vehicle) {
-        if (e.vehicle.vehicle_flags == VHF_PLAYERSLOT) return;
-        antilag_record(e.vehicle, e.vehicle, t);
-    }
+       if (e.vehicle) {
+               if (e.vehicle.vehicle_flags == VHF_PLAYERSLOT) return;
+               antilag_record(e.vehicle, e.vehicle, t);
+       }
 
        if (time < store.antilag_times[store.antilag_index]) return;
        store.antilag_index += 1;
@@ -86,9 +86,9 @@ vector antilag_takebackavgvelocity(entity e, entity store, float t0, float t1)
 void antilag_takeback(entity e, entity store, float t)
 {
        if (e.vehicle) {
-           if (e.vehicle.vehicle_flags == VHF_PLAYERSLOT) return;
+               if (e.vehicle.vehicle_flags == VHF_PLAYERSLOT) return;
                antilag_takeback(e.vehicle, e.vehicle, t);
-    }
+       }
 
        if (!store.antilag_takenback)
                store.antilag_saved_origin = e.origin;
@@ -101,7 +101,7 @@ void antilag_takeback(entity e, entity store, float t)
 void antilag_restore(entity e, entity store)
 {
        if (e.vehicle) {
-           if (e.vehicle.vehicle_flags == VHF_PLAYERSLOT) return;
+               if (e.vehicle.vehicle_flags == VHF_PLAYERSLOT) return;
                antilag_restore(e.vehicle, e.vehicle);
        }
 

diff --git a/qcsrc/tools/compilationunits.sh b/qcsrc/tools/compilationunits.sh
index 7a7ff17b6d554cbe6451ae2dda773ec81b017088..d13cb6e091e8f2dd9e350f78e25fc30f7de33d35 100755 (executable)
--- a/qcsrc/tools/compilationunits.sh
+++ b/qcsrc/tools/compilationunits.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+[ -z "$QCCFLAGS_WATERMARK" ] && export QCCFLAGS_WATERMARK=$(git describe --tags --dirty='~')
 set -eu
 cd ${0%/*}
 
@@ -29,7 +30,7 @@ CPP="cc -xc -E"
 declare -a QCCDEFS=(
     -DNDEBUG=1
     -DXONOTIC=1
-    -DWATERMARK="\"$(git describe --tags --dirty='~')\""
+    -DWATERMARK="\"$QCCFLAGS_WATERMARK\""
     -DENABLE_EFFECTINFO=0
     -DENABLE_DEBUGDRAW=0
     -DENABLE_DEBUGTRACE=0
@@ -66,10 +67,10 @@ function check1() {
     MODE=${prog}
     includes="-include lib/_all.inc"
     [ -f ${prog}/_all.qh ] && includes="${includes} -include ${prog}/_all.qh"
-    qpp ${file} test.dat \
+    qpp ${file} test-${prog}.dat \
             ${includes} \
             -I. ${QCCIDENT} ${QCCDEFS} > ${WORKDIR}/${prog}.qc
-    qcc ${QCCFLAGS} -o ../${WORKDIR}/test.dat ../${WORKDIR}/${prog}.qc >/dev/null
+    qcc ${QCCFLAGS} -o ../${WORKDIR}/test-${prog}.dat ../${WORKDIR}/${prog}.qc >/dev/null
 }
 
 function check() {
@@ -85,6 +86,7 @@ if [ ${#@} -eq 0 ]; then
     check menu
 else
     for var in ${@}; do
+        var=${var#test-}
         check ${var}
     done
 fi