X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.gitlab-ci.yml;h=8b56b81ff39f4e9dda7e29a01cca19b8d679fd06;hp=4cce7de00c024b8387df27d3a958c5003ef31688;hb=0f318cfd5e7b56140cc6a0274e7ec5f258c30157;hpb=b35562aab95e8f1c0cfafda7bd35271180160acc

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4cce7de00..8b56b81ff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,97 +1,99 @@
-workflow:
-  rules:
-    - if: $CI_COMMIT_MESSAGE =~ /Transifex autosync/
-      when: never
-    - when: always
-
-before_script:
-  - ln -s $PWD data/xonotic-data.pk3dir
-
-  - git clone --depth=1 --branch=main https://gitlab.com/xonotic/gmqcc.git gmqcc
-  - cd gmqcc && make -j $(nproc) && export QCC="$PWD/gmqcc"
-  - cd ..
-
-report_cloc:
-  before_script:
-    - ln -s $PWD data/xonotic-data.pk3dir # is this needed?
-  rules:
-    - changes:
-      - qcsrc/*
-  stage: test
-  script:
-    - cloc --force-lang-def=qcsrc/tools/cloc.txt --sql 1 --sql-project xonotic qcsrc | sqlite3 code.db
-    - sqlite3 code.db 'select file,nCode from t where nCode > 1000 order by nBlank+nComment+nCode desc'
-
-test_compilation_units:
-  rules:
-    - changes:
-      - qcsrc/*
-  stage: test
-  script:
-    - ./qcsrc/tools/compilationunits.sh
-
-test_sv_game:
-  stage: test
-  script:
-    - git clone --depth=1 --branch=div0-stable https://gitlab.com/xonotic/darkplaces.git darkplaces
-    - cd darkplaces && make sv-debug -j $(nproc) && export ENGINE="$PWD/darkplaces-dedicated -xonotic"
-    - cd ..
-
-    - mkdir -p data/maps
-    - 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
-    - make
-    - EXPECT=92bbad07902d2d045c65e54579993365
-    - HASH=$(${ENGINE} -noconfig -nohome +exec serverbench.cfg
-      | tee /dev/stderr
-      | grep '^:'
-      | grep -v '^:gamestart:'
-      | grep -v '^:anticheat:'
-      | md5sum | awk '{ print $1 }')
-    - echo 'expected:' $EXPECT
-    - echo '  actual:' $HASH
-    - test "$HASH" == "$EXPECT"
-    - exit $?
-
-test_sv_unit:
-  stage: test
-  script:
-    - git clone --depth=1 --branch=div0-stable https://gitlab.com/xonotic/darkplaces.git darkplaces
-    - cd darkplaces && make sv-debug -j $(nproc) && export ENGINE="$PWD/darkplaces-dedicated -xonotic"
-    - cd ..
-
-    - mkdir maps && wget -O maps/gitlab-ci.bsp https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/_init/_init.bsp
-    - make
-    - while read line; do
-        echo $line;
-        if [[ $line == "All tests OK" ]]; then exit 0; fi;
-      done < <(${ENGINE} +developer 1 +map gitlab-ci +sv_cmd runtest +exit)
-    - exit 1
-
-# NOTE: The generated docs are incomplete - they don't contain code behind SVQC CSQC MENUQC GAMEQC ifdefs.
-# With them added to PREDEFINED, it would take over half an hour to generate the docs and even then
-# they might not be complete. Doxygen doesn't handle #elif and might not understand some QC definitions.
-doxygen:  # rename to 'pages' when gitlab.com allows pages to exceed 100MiB
-  before_script:
-    - ln -s $PWD data/xonotic-data.pk3dir # is this needed?
-  stage: deploy
-  script:
-    - cd qcsrc && doxygen
-    - mv html ../public
-    - for i in {0..0}; do eval $(printf "echo \$id_rsa_%02d\n" $i) >> ~/.ssh/id_rsa_base64; done
-    - base64 --decode ~/.ssh/id_rsa_base64 > ~/.ssh/id_rsa
-    - chmod 600 ~/.ssh/id_rsa
-    - echo -e "Host *\n\tStrictHostKeyChecking no\n\tLogLevel ERROR\n" >> ~/.ssh/config
-    - git config --global user.name "Gitlab CI"
-    - git config --global user.email "<>"
-    - git clone --single-branch --depth 1 ${DEPLOY_HOST}:${DEPLOY_REPO} ~/deploy_
-    - mkdir ~/deploy && mv ~/deploy_/.git ~/deploy && rm -r ~/deploy_
-    - cp -r ../public/* ~/deploy
-    - cd ~/deploy && git add -A . && git commit -m "Deploy ${CI_BUILD_REF}" && git push origin gh-pages
-  artifacts:
-    paths:
-      - public
-  only:
-    - master
+workflow:
+  rules:
+    - if: $CI_COMMIT_MESSAGE =~ /Transifex autosync/
+      when: never
+    - when: always
+
+before_script:
+  - ln -s $PWD data/xonotic-data.pk3dir
+
+  - export MAKEFLAGS=-j$(nproc); echo MAKEFLAGS=$MAKEFLAGS
+#   FIXME: -march=native -mtune=native _changes the hash_, why?!?
+# - export CC="gcc -pipe -march=native -mtune=native"
+  - export CC="gcc -pipe"
+
+  - git clone --depth=1 --branch=main https://gitlab.com/xonotic/gmqcc.git gmqcc
+  - make -C gmqcc || exit 1
+  - export QCC="$PWD/gmqcc/gmqcc"
+
+  # Makefile: don't complain about lack of tags (fetching them is slow)
+  - export QCCFLAGS_WATERMARK=gitlab_pipeline
+  # Makefile: don't compress anything or complain about lack of zip program
+  - export ZIP=/bin/true
+
+test_compilation_units:
+  rules:
+    - changes:
+      - qcsrc/**/*
+  stage: test
+  script:
+    - make test
+
+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"
+    - 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
+
+    - while read LINE; do
+        echo $LINE;
+        [ "$LINE" = "All tests OK" ] && PASS=1;
+      done < <(${ENGINE} +developer 1 +map gitlab-ci +sv_cmd runtest +wait +quit)
+    - test "$PASS" = "1" || { echo 'sv_cmd runtest failed!'; exit 1; }
+
+    - ${ENGINE} +map gitlab-ci +sv_cmd dumpnotifs +wait +quit
+    - 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
+
+    - EXPECT=8e36763a3b4590356bcc449b2452d0ea
+    - HASH=$(${ENGINE} +timestamps 1 +exec serverbench.cfg
+      | tee /dev/stderr
+      | sed -e 's,^\[[^]]*\] ,,'
+      | grep '^:'
+      | grep -v '^:gamestart:'
+      | grep -v '^:anticheat:'
+      | md5sum | awk '{ print $1 }')
+    - echo 'expected:' $EXPECT
+    - echo '  actual:' $HASH
+    - test "$HASH" == "$EXPECT"
+    - exit $?
+
+
+# NOTE: The generated docs are incomplete - they don't contain code behind SVQC CSQC MENUQC GAMEQC ifdefs.
+# With them added to PREDEFINED, it would take over half an hour to generate the docs and even then
+# they might not be complete. Doxygen doesn't handle #elif and might not understand some QC definitions.
+#doxygen:  # rename to 'pages' when gitlab.com allows pages to exceed 100MiB
+#  before_script:
+#    - ln -s $PWD data/xonotic-data.pk3dir # is this needed?
+#    - apt-get update
+#    - apt-get -y install doxygen graphviz
+#  stage: deploy
+#  script:
+#    - cd qcsrc && doxygen
+#    - mv html ../public
+#    - mkdir -p ~/.ssh
+#    - for i in {0..0}; do eval $(printf "echo \$id_rsa_%02d\n" $i) >> ~/.ssh/id_rsa_base64; done
+#    - base64 --decode ~/.ssh/id_rsa_base64 > ~/.ssh/id_rsa
+#    - chmod 600 ~/.ssh/id_rsa
+#    - echo -e "Host *\n\tStrictHostKeyChecking no\n\tLogLevel ERROR\n" >> ~/.ssh/config
+#    - git config --global user.name "Gitlab CI"
+#    - git config --global user.email "<>"
+#    - git clone --single-branch --depth 1 ${DEPLOY_HOST}:${DEPLOY_REPO} ~/deploy_
+#    - mkdir ~/deploy && mv ~/deploy_/.git ~/deploy && rm -r ~/deploy_
+#    - cp -r ../public/* ~/deploy
+#    - cd ~/deploy && git add -A . && git commit -m "Deploy ${CI_BUILD_REF}" && git push origin gh-pages
+#  artifacts:
+#    paths:
+#      - public
+#  only:
+#    - master