pipeline: don't complain about lack of zip program and git tags

we don't want to fetch the tags or install a zip program as it would be
slow and not useful

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cc7b5bd0628e4677a751066f984548dbe9b2408c..b5a763f2cd1e923f626cdedf3be7204534ef531b 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,6 +16,11 @@ before_script:
   - 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
     - changes:\r

diff --git a/qcsrc/tools/compilationunits.sh b/qcsrc/tools/compilationunits.sh
index 375b534ae5b250be072da68ac7363259e9e182ca..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