Merge branch 'bones_was_here/lms_specwarn' into 'master'

[xonotic/xonotic-data.pk3dir.git] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b5031c66ba00fd15d0976d0aed715b09e47cc48c..8818e7d163aad5bfdf09d1a8f48f7202317eda51 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,7 +32,7 @@ test_sv_game:
     - 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
-    - EXPECT=7b55642e475a26f6fb397093e6f8fe81\r
+    - EXPECT=d4060caf37a2e60bab68d1f83bc57368\r
     - HASH=$(${ENGINE} -noconfig -nohome +timestamps 1 +exec serverbench.cfg\r
       | tee /dev/stderr\r
       | sed -e 's,^\[[^]]*\] ,,'\r
@@ -63,28 +63,28 @@ test_sv_unit:
 # 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
 # they might not be complete. Doxygen doesn't handle #elif and might not understand some QC definitions.\r
-doxygen:  # rename to 'pages' when gitlab.com allows pages to exceed 100MiB\r
-  before_script:\r
-    - ln -s $PWD data/xonotic-data.pk3dir # is this needed?\r
-    - apt-get update\r
-    - apt-get -y install doxygen graphviz\r
-  stage: deploy\r
-  script:\r
-    - cd qcsrc && doxygen\r
-    - mv html ../public\r
-    - mkdir -p ~/.ssh\r
-    - for i in {0..0}; do eval $(printf "echo \$id_rsa_%02d\n" $i) >> ~/.ssh/id_rsa_base64; done\r
-    - base64 --decode ~/.ssh/id_rsa_base64 > ~/.ssh/id_rsa\r
-    - chmod 600 ~/.ssh/id_rsa\r
-    - echo -e "Host *\n\tStrictHostKeyChecking no\n\tLogLevel ERROR\n" >> ~/.ssh/config\r
-    - git config --global user.name "Gitlab CI"\r
-    - git config --global user.email "<>"\r
-    - git clone --single-branch --depth 1 ${DEPLOY_HOST}:${DEPLOY_REPO} ~/deploy_\r
-    - mkdir ~/deploy && mv ~/deploy_/.git ~/deploy && rm -r ~/deploy_\r
-    - cp -r ../public/* ~/deploy\r
-    - cd ~/deploy && git add -A . && git commit -m "Deploy ${CI_BUILD_REF}" && git push origin gh-pages\r
-  artifacts:\r
-    paths:\r
-      - public\r
-  only:\r
-    - master\r
+#doxygen:  # rename to 'pages' when gitlab.com allows pages to exceed 100MiB\r
+#  before_script:\r
+#    - ln -s $PWD data/xonotic-data.pk3dir # is this needed?\r
+#    - apt-get update\r
+#    - apt-get -y install doxygen graphviz\r
+#  stage: deploy\r
+#  script:\r
+#    - cd qcsrc && doxygen\r
+#    - mv html ../public\r
+#    - mkdir -p ~/.ssh\r
+#    - for i in {0..0}; do eval $(printf "echo \$id_rsa_%02d\n" $i) >> ~/.ssh/id_rsa_base64; done\r
+#    - base64 --decode ~/.ssh/id_rsa_base64 > ~/.ssh/id_rsa\r
+#    - chmod 600 ~/.ssh/id_rsa\r
+#    - echo -e "Host *\n\tStrictHostKeyChecking no\n\tLogLevel ERROR\n" >> ~/.ssh/config\r
+#    - git config --global user.name "Gitlab CI"\r
+#    - git config --global user.email "<>"\r
+#    - git clone --single-branch --depth 1 ${DEPLOY_HOST}:${DEPLOY_REPO} ~/deploy_\r
+#    - mkdir ~/deploy && mv ~/deploy_/.git ~/deploy && rm -r ~/deploy_\r
+#    - cp -r ../public/* ~/deploy\r
+#    - cd ~/deploy && git add -A . && git commit -m "Deploy ${CI_BUILD_REF}" && git push origin gh-pages\r
+#  artifacts:\r
+#    paths:\r
+#      - public\r
+#  only:\r
+#    - master\r