X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=fa3b05defc7743b67a527d7aed3dcbed7576498d;hb=fdb5e724889d20d179233d9cc23e812804ca842b;hp=2c0625459ddff56266361af5cf5646c47276de2d;hpb=48f85772a504c472a24ca03aa67a6c3649c87cc1;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2c0625459..fa3b05def 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=6d483a4a7031e4ba8ed1f7f10389976f + - EXPECT=d6e01eaffcd909210422a0349bbe4918 - 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 ..