X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=09f32ba196dbe54ea108e54c9665b92cb0030dda;hb=d9ddf453dcd3f6e4cce5dbe394fd7936048ea6ad;hp=4754425bf971689d6df0aaf9cfdad7f13dcd7595;hpb=3cfa3eaf6856fe76f7fd8c945fbfab2e9e28014c;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4754425bf..09f32ba19 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=fb771b180a47f7acf09eb12dddd391f8 + - EXPECT=bb534e81ce09934ceadfd952a8ecd016 - 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 ..