From 4e2ad4eb5ea3ee9cb4cb0828982b73aef9803f9f Mon Sep 17 00:00:00 2001
From: nrbffs <git-ffs@nicoboehr.de>
Date: Sun, 15 Sep 2019 20:58:28 +0200
Subject: [PATCH] CI: build manifest for all update channels

Build the manifest for stable, beta and nightly in the package step.
This avoids the need of a rebuild to publish the firmware on a
different channel.
---
 .gitlab-ci.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 87b9ed83d..5f368c39d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -132,9 +132,8 @@ target:x86-64:
 package:
   stage: package
   script:
-    - GLUON_BRANCH=$(./get-gluon-branch.sh)
-    - test -z "$GLUON_BRANCH" || make -C gluon update GLUON_SITEDIR="$CI_PROJECT_DIR"
-    - test -z "$GLUON_BRANCH" || make -C gluon manifest GLUON_BRANCH=$(./get-gluon-branch.sh) GLUON_SITEDIR="$CI_PROJECT_DIR" V=1
+    - make -C gluon update GLUON_SITEDIR="$CI_PROJECT_DIR"
+    - for branch in "stable" "beta" "nightly"; do make -C gluon manifest GLUON_BRANCH="$branch" GLUON_SITEDIR="$CI_PROJECT_DIR" V=1; done
   artifacts:
     paths:
       - gluon/output
-- 
GitLab