From: bones_was_here Date: Tue, 29 Nov 2022 07:09:06 +0000 (+1000) Subject: pipeline: prefer to skip gmqcc build by downloading from beta.xonotic.org and update... X-Git-Tag: xonotic-v0.8.6~282 X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=3f4496f15cc88853d818a3e68fa731c28928f4a4;p=xonotic%2Fxonotic-data.pk3dir.git pipeline: prefer to skip gmqcc build by downloading from beta.xonotic.org and update DP URL --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 77155987c..b6735a471 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,9 +12,15 @@ before_script: # - export CC="gcc -pipe -march=native -mtune=native" - export CC="gcc -pipe" - - git clone --depth=1 --branch=main https://gitlab.com/xonotic/gmqcc.git gmqcc - - make -C gmqcc || exit 1 - - export QCC="$PWD/gmqcc/gmqcc" + - > + if wget -nv https://beta.xonotic.org/pipeline-bin/gmqcc ; then + export QCC="$PWD/gmqcc" + chmod +x "$QCC" + else + git clone --depth=1 --branch=main https://gitlab.com/xonotic/gmqcc.git gmqcc + make -C gmqcc || exit 1 + export QCC="$PWD/gmqcc/gmqcc" + fi # Makefile: don't complain about lack of tags (fetching them is slow) - export QCCFLAGS_WATERMARK=gitlab_pipeline @@ -33,7 +39,7 @@ test_sv_game: stage: test script: - > - if wget -nv https://beta.xonotic.org/autobuild-rsync/Xonotic/xonotic-linux64-dedicated ; then + if wget -nv https://beta.xonotic.org/pipeline-bin/xonotic-linux64-dedicated ; then export ENGINE="$PWD/xonotic-linux64-dedicated" chmod +x "$ENGINE" else