Skip to content
Snippets Groups Projects
Commit 3865d38d authored by Nico's avatar Nico
Browse files

remove deprecated GLUON_BRANCH

Makefile:32: *** Warning: GLUON_BRANCH has been deprecated, please set GLUON_AUTOUPDATER_BRANCH and GLUON_AUTOUPDATER_ENABLED instead.

So let's use the new variables now.
parent 23638e07
No related branches found
No related tags found
No related merge requests found
Pipeline #1075 passed
......@@ -67,7 +67,7 @@ update:
except:
- tags
script:
- make -C gluon GLUON_SITEDIR="$CI_PROJECT_DIR" GLUON_TARGET="$GLUON_TARGET" GLUON_BRANCH=stable FFS_BUILD_DATE=$(cat build.date) BROKEN="$BROKEN" V=1 -j`nproc`
- make -C gluon GLUON_SITEDIR="$CI_PROJECT_DIR" GLUON_TARGET="$GLUON_TARGET" GLUON_AUTOUPDATER_BRANCH=stable GLUON_AUTOUPDATER_ENABLED=1 FFS_BUILD_DATE=$(cat build.date) BROKEN="$BROKEN" V=1 -j`nproc`
artifacts:
paths:
- gluon/output/
......@@ -187,7 +187,7 @@ target:x86-64:
package:
stage: package
script:
- for branch in "stable" "beta" "nightly" "experimental"; do make -C gluon manifest GLUON_BRANCH="$branch" GLUON_SITEDIR="$CI_PROJECT_DIR" FFS_BUILD_DATE=$(cat build.date) V=1; done
- for branch in "stable" "beta" "nightly" "experimental"; do make -C gluon manifest GLUON_AUTOUPDATER_BRANCH="$branch" GLUON_AUTOUPDATER_ENABLED=1 GLUON_SITEDIR="$CI_PROJECT_DIR" FFS_BUILD_DATE=$(cat build.date) V=1; done
- if [ -n "$GLUON_SIGN_KEY" ]; then cd gluon && for branch in "nightly" "experimental"; do ./contrib/sign.sh <(echo "$GLUON_SIGN_KEY") "output/images/sysupgrade/$branch.manifest"; done; fi
cache:
paths:
......
......@@ -34,5 +34,5 @@ make -C gluon update GLUON_SITEDIR="$sitedir" V=1
for target in ${TARGETS[@]}; do
echo Building $target
make -C gluon GLUON_TARGET=$target GLUON_BRANCH=$branch GLUON_SITEDIR="$sitedir" BROKEN=1 V=1 -j`nproc`
make -C gluon GLUON_TARGET=$target GLUON_AUTOUPATER_BRANCH=$branch GLUON_AUTOUPDATER_ENABLED=1 GLUON_SITEDIR="$sitedir" BROKEN=1 V=1 -j`nproc`
done
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment