diff options
| author | Daniel Ehlers <danielehlers@mindeye.net> | 2018-07-03 08:21:30 +0200 |
|---|---|---|
| committer | rubo77 <github@r.z11.de> | 2018-07-03 08:35:15 +0200 |
| commit | 3d4ac175b79552e4a848e6c1ac38c7d17ae59539 (patch) | |
| tree | c962673f8ae40c266c2f2c81e8bf44cdc1ed169f | |
| parent | 1e5177ba89b0b5429098d5b923a5918711a638c3 (diff) | |
Remerge signing into the build stagerelease-candidate
| -rw-r--r-- | .gitlab-ci.yml | 31 |
1 files changed, 6 insertions, 25 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 946d7f3..60c7678 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,6 @@ stages: - prepare - clone - build - - sign - upload # Preparation @@ -34,7 +33,6 @@ prepare: cache: {} # Cache maintenance - clone: stage: clone image: $CI_REGISTRY_IMAGE/build @@ -47,7 +45,6 @@ clone: dependencies: [] # Actual building - build: stage: build image: $CI_REGISTRY_IMAGE/build @@ -58,10 +55,14 @@ build: - ./gitlab-ci/build.sh -c update -b $CI_COMMIT_REF_NAME -n $CI_PIPELINE_ID -m "-j $(nproc --all) V=s" | tee -a debug.log # We should never need this, should we? - ./gitlab-ci/build.sh -c clean -b $CI_COMMIT_REF_NAME -n $CI_PIPELINE_ID -m "-j $(nproc --all) V=s" | tee -a debug.log - #- ./gitlab-ci/build.sh -c download -b $CI_COMMIT_REF_NAME -n $CI_PIPELINE_ID -m "-j $(nproc --all) V=s" | tee -a debug.log + # In the past this build step repeadatly break + # - ./gitlab-ci/build.sh -c download -b $CI_COMMIT_REF_NAME -n $CI_PIPELINE_ID -m "-j $(nproc --all) V=s" | tee -a debug.log - ./gitlab-ci/build.sh -c build -b $CI_COMMIT_REF_NAME -n $CI_PIPELINE_ID -m "-j $(nproc --all) V=s" | tee -a debug.log # Bring gluon repo to cacheable state - ./gitlab-ci/build.sh -c clean -b $CI_COMMIT_REF_NAME -n $CI_PIPELINE_ID -m "-j $(nproc --all) V=s" | tee -a debug.log + # Sign + - echo $SIGNING_KEY > signing_key + - ./gitlab-ci/build.sh -c sign -b $CI_COMMIT_REF_NAME -s $(pwd)/signing_key artifacts: untracked: false paths: @@ -71,26 +72,6 @@ build: when: always dependencies: [] -sign: - stage: sign - image: $CI_REGISTRY_IMAGE/build - script: - - echo $SIGNING_KEY > signing_key - # Update git in case cache is empty - - ./gitlab-ci/update-git.sh | tee -a debug.log - - ./gitlab-ci/build.sh -c sign -b $CI_COMMIT_REF_NAME -s $(pwd)/signing_key - artifacts: - untracked: false - paths: - - output - 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 image: $CI_REGISTRY_IMAGE/build @@ -101,5 +82,5 @@ upload: - mkdir -p gluon - ./gitlab-ci/build.sh -c upload -b $CI_COMMIT_REF_NAME -n $CI_PIPELINE_ID dependencies: - - sign + - build cache: {} |