X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=.gitlab-ci.yml;h=1eb84dbe87c84c09730077b247ad28d409a56795;hb=090f40206b90ce05199d7c50e366bdfce5ab8b82;hp=0d59531c9aad855bda3088f1a5c0e4cd3698054e;hpb=2c5e766a6c71a411e4ceba9b9666f7d66c6ce65d;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0d59531c9..1eb84dbe8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,19 +11,6 @@ before_script: - cd gmqcc && make -j $(nproc) && export QCC="$PWD/gmqcc" - cd .. -report_cloc: - before_script: - - ln -s $PWD data/xonotic-data.pk3dir # is this needed? - - apt-get update - - apt-get -y install cloc sqlite3 - rules: - - changes: - - qcsrc/**/* - stage: test - script: - - cloc --force-lang-def=qcsrc/tools/cloc.txt --sql 1 --sql-project xonotic qcsrc | sqlite3 code.db - - sqlite3 code.db 'select file,nCode from t where nCode > 1000 order by nBlank+nComment+nCode desc' - test_compilation_units: rules: - changes: @@ -45,7 +32,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=d0fbc20e0d823c8d6919edfa68c5f389 + - EXPECT=dfb2a117b18258dfcc0b95e7e9f54189 - HASH=$(${ENGINE} -noconfig -nohome +timestamps 1 +exec serverbench.cfg | tee /dev/stderr | sed -e 's,^\[[^]]*\] ,,'