X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=77d421436fd236b2ec9944b2b6aee7fc1a8e7bb9;hb=312bbd2482f149e05df5df8c95459c67de581906;hp=ad6e329af8cc93303ec534b519aedfa561506e7f;hpb=5d799ab88d7e88b6f9926c8996f02adddf231320;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ad6e329af..77d421436 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,33 +1,25 @@
 before_script:
-  - git clone --depth=1 --branch=master https://gitlab.com/xonotic/darkplaces.git darkplaces
-  - cd darkplaces && make sv-debug -j $(nproc)
-  - cd ..
-  - export ENGINE="$PWD/darkplaces/darkplaces-dedicated -xonotic"
+  - ln -s $PWD data/xonotic-data.pk3dir
 
   - git clone --depth=1 --branch=master https://gitlab.com/xonotic/gmqcc.git gmqcc
-  - cd gmqcc && make -j $(nproc)
+  - cd gmqcc && make -j $(nproc) && export QCC="$PWD/gmqcc"
   - cd ..
-  - export QCC="$PWD/gmqcc/gmqcc"
-
-  - ln -s $PWD data/xonotic-data.pk3dir
 
-test_sv_unit:
+test_compilation_units:
   stage: test
   script:
-    - 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
+    - ./qcsrc/tools/compilationunits.sh
 
 test_sv_game:
   stage: test
   script:
+    - git clone --depth=1 --branch=master https://gitlab.com/xonotic/darkplaces.git darkplaces
+    - cd darkplaces && make sv-debug -j $(nproc) && export ENGINE="$PWD/darkplaces-dedicated -xonotic"
+    - cd ..
+
     - wget -O data/g-23.pk3 http://beta.xonotic.org/autobuild-bsp/latest/g-23.pk3
     - make
-    - EXPECT=cf9b6ac0ea575904a75099afd1b71124
+    - EXPECT=07fdfd9a19025920a599995730eb2a78
     - HASH=$(${ENGINE} -noconfig -nohome +exec serverbench.cfg
       | tee /dev/stderr
       | grep '^:'
@@ -39,6 +31,21 @@ test_sv_game:
     - test "$HASH" == "$EXPECT"
     - exit $?
 
+test_sv_unit:
+  stage: test
+  script:
+    - git clone --depth=1 --branch=master 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
+
 doxygen:  # rename to 'pages' when gitlab.com allows pages to exceed 100MiB
   stage: deploy
   script:
@@ -53,7 +60,7 @@ doxygen:  # rename to 'pages' when gitlab.com allows pages to exceed 100MiB
     - 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 "Update" && git push origin gh-pages
+    - cd ~/deploy && git add -A . && git commit -m "Deploy ${CI_BUILD_REF}" && git push origin gh-pages
   artifacts:
     paths:
       - public