From eddf7dbcc8c170baf505eb6ba7d4a9901c5792c3 Mon Sep 17 00:00:00 2001 From: nrbffs <git-ffs@nicoboehr.de> Date: Sun, 15 Sep 2019 20:55:36 +0200 Subject: [PATCH] CI: always build with GLUON_BRANCH=stable Just always default to the stable autoupdater branch. Just because someone uses a nightly or beta image doesn't necessarily mean we should also push them to that update channel. If a user wants to change, they can still do so in config mode. --- .gitlab-ci.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 261296520..87b9ed83d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,19 +8,12 @@ stages: - build - package -# Build Types -# ---- -# -# * commit: build all branches on commit for x86-64 target.# -# * nightly: built once a night from `master` branch for all targets. -# * beta: built from tag starting with "beta/", i.e. "beta/1.7-beta01" for all targets. -# * stable: built from tag starting with "stable/", i.e. "stable/1.5" for all targets. .target: stage: build script: - make -C gluon update GLUON_SITEDIR="$CI_PROJECT_DIR" - - make -C gluon GLUON_SITEDIR="$CI_PROJECT_DIR" GLUON_TARGET="$GLUON_TARGET" GLUON_BRANCH=$(./get-gluon-branch.sh) V=1 -j`nproc` + - make -C gluon GLUON_SITEDIR="$CI_PROJECT_DIR" GLUON_TARGET="$GLUON_TARGET" GLUON_BRANCH=stable V=1 -j`nproc` artifacts: paths: - gluon/output/ -- GitLab