X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.gitlab-ci.yml;h=1eb84dbe87c84c09730077b247ad28d409a56795;hp=31378d8d25d85d6432a5b73209a2b11fc88127c1;hb=HEAD;hpb=9e0107ad74a31422e209d4f97dbc4fdc9b669727

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 31378d8d2..7647566df 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,113 +1,71 @@
-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"
-
-  - >
-    if wget -nv https://beta.xonotic.org/pipeline-bin/gmqcc ; then
-      export QCC="$PWD/gmqcc"
-      chmod +x "$QCC"
-    else
-      git clone --depth=1 --branch=main https://gitlab.com/xonotic/gmqcc.git gmqcc
-      make -C gmqcc || exit 1
-      export QCC="$PWD/gmqcc/gmqcc"
-    fi
-
-  # 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:
-    - >
-      if wget -nv https://beta.xonotic.org/pipeline-bin/xonotic-linux64-dedicated ; then
-        export ENGINE="$PWD/xonotic-linux64-dedicated"
-        chmod +x "$ENGINE"
-      else
-        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"
-      fi
-    - export ENGINE="$ENGINE -noconfig -nohome"
-
-    - make qc || exit 1
-
-    - mkdir -p data/maps
-    - wget -nv -O data/maps/_init.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 _init +sv_cmd runtest +wait +quit)
-    - test "$PASS" = "1" || { echo 'sv_cmd runtest failed!'; exit 1; }
-
-    - ${ENGINE} +map _init +sv_cmd dumpnotifs +wait +quit
-    - diff notifications.cfg data/data/notifications_dump.cfg ||
-        { echo 'Please update notifications.cfg using `dumpnotifs`!'; exit 1; }
-
-    - wget -nv -O data/stormkeep.pk3 http://beta.xonotic.org/autobuild-bsp/latest/stormkeep.pk3
-    - wget -nv -O data/maps/stormkeep.mapinfo https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.mapinfo
-    - wget -nv -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints
-    - wget -nv -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache
-
-    - EXPECT=8fb740a3cb3754ca7b9295ddc5c911b5
-    - 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
+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
+  - export CC="gcc -pipe"
+
+  - >
+    if wget -nv https://beta.xonotic.org/pipeline-bin/gmqcc ; then
+      export QCC="$PWD/gmqcc"
+      chmod +x "$QCC"
+    else
+      git clone --depth=1 --branch=main https://gitlab.com/xonotic/gmqcc.git gmqcc
+      make -C gmqcc || exit 1
+      export QCC="$PWD/gmqcc/gmqcc"
+    fi
+
+  # 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:
+    - export EXPECT=ded5d54d7a8326069f5f3d015cee1bf2
+    - qcsrc/tools/sv_game-hashtest.sh
+    - 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