X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=e6e7d5b3cc8f05ef79fc1daa3605fd7e376c0b3c;hb=6edeeb916f7c823714f1d9ea64e2a7705de7ef00;hp=cab4226b2419d828c5fa82692286e7d0aeebcd6c;hpb=81ce7054f9ec7e114c2864d6da5cb60ab4080e6a;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cab4226b2..e6e7d5b3c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ test_compilation_units: test_sv_game: stage: test script: - - git clone --depth=1 --branch=master https://gitlab.com/xonotic/darkplaces.git darkplaces + - 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 .. @@ -29,7 +29,7 @@ test_sv_game: - 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=261924c19f8ce2492fd45c0e97e37730 + - EXPECT=1c17d1c4e3c98de30d9bec68a635f600 - HASH=$(${ENGINE} -noconfig -nohome +exec serverbench.cfg | tee /dev/stderr | grep '^:' @@ -44,7 +44,7 @@ test_sv_game: test_sv_unit: stage: test script: - - git clone --depth=1 --branch=master https://gitlab.com/xonotic/darkplaces.git darkplaces + - 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 ..