aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Schramm <tobleminer@gmail.com>2018-06-30 22:06:23 +0200
committerTobias Schramm <tobleminer@gmail.com>2018-06-30 22:06:23 +0200
commit173e5ba2d3eb1178041e998c969b7c0cc271df66 (patch)
treed7abf51fb672466fda2ec3cc820ac434a864e4c2
parent002813eb0bd66d9ba55c3bb3775810388ba9d899 (diff)
Merge build and sign job (for now)devel
-rw-r--r--.gitlab-ci.yml47
1 files changed, 26 insertions, 21 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 010bec4..ba36852 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,8 @@ stages:
- prepare
- clone
- build
- - sign
+# currently unused, maybe reintroduce later?
+# - sign
- upload
# Preparation
@@ -61,6 +62,8 @@ build:
- ./build.sh -c build -b $CI_BUILD_REF_NAME -n $CI_JOB_ID -m "-j $(nproc --all) V=s" | tee -a debug.log
# Bring gluon repo to cacheable state
- ./build.sh -c clean -b $CI_BUILD_REF_NAME -n $CI_JOB_ID -m "-j $(nproc --all) V=s" | tee -a debug.log
+ # Sign firmware images and packages
+ - ./build.sh -c sign -b $CI_BUILD_REF_NAME -s $(pwd)/signing_key
artifacts:
untracked: false
paths:
@@ -69,26 +72,28 @@ build:
expire_in: 1 day
when: always
-sign:
- stage: sign
- image: $CI_REGISTRY_IMAGE/build
- script:
- - echo $SIGNING_KEY > signing_key
- # Update git in case cache is empty
- - ./update-git.sh | tee -a debug.log
- - ./build.sh -c sign -b $CI_BUILD_REF_NAME -s $(pwd)/signing_key
- artifacts:
- untracked: false
- paths:
- - output
- expire_in: 1 hour
- cache:
- key: $CI_COMMIT_REF_SLUG-$GLUON_GIT-$GLUON_BRANCH
- paths:
- - gluon
- policy:
- # This step does not need to modify the cache
- pull
+# currently unused, implemented in build
+#sign:
+# stage: sign
+# image: $CI_REGISTRY_IMAGE/build
+# script:
+# - echo $SIGNING_KEY > signing_key
+# # Update git in case cache is empty
+# - ./update-git.sh | tee -a debug.log
+# # Sign firmware images and packages
+# - ./build.sh -c sign -b $CI_BUILD_REF_NAME -s $(pwd)/signing_key
+# artifacts:
+# untracked: false
+# paths:
+# - output
+# expire_in: 1 hour
+# cache:
+# key: $CI_COMMIT_REF_SLUG-$GLUON_GIT-$GLUON_BRANCH
+# paths:
+# - gluon
+# policy:
+# # This step does not need to modify the cache
+# pull
upload:
stage: upload