CI: build and upload with stable as autoupdater branch and don't try to upload the folder "other"

parent 409f2628
Pipeline #865 failed with stages
in 61 minutes and 18 seconds
......@@ -47,20 +47,20 @@ build:
- 'echo "building with those options: $MAKEOPTS"'
# former clone step
- ./.gitlab-ci/update-git.sh 2>&1 | tee -a debug.log
- ./.gitlab-ci/build.sh -c update -b $CI_COMMIT_REF_NAME -n $CI_PIPELINE_ID -m "$MAKEOPTS" 2>&1 | tee -a debug.log
- ./.gitlab-ci/build.sh -c update -b stable -n $CI_PIPELINE_ID -m "$MAKEOPTS" 2>&1 | 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)" 2>&1 | tee -a debug.log
- ./.gitlab-ci/build.sh -c clean -b stable -n $CI_PIPELINE_ID -m "-j $(nproc --all)" 2>&1 | tee -a debug.log
# Apply patches
- ./.gitlab-ci/patch.sh patches gluon
# Build
- ./.gitlab-ci/build.sh -c build -b $CI_COMMIT_REF_NAME -n $CI_PIPELINE_ID -m "$MAKEOPTS" 2>&1 | tee -a debug.log
- ./.gitlab-ci/build.sh -c build -b stable -n $CI_PIPELINE_ID -m "$MAKEOPTS" 2>&1 | tee -a debug.log
# Revert patches
- ./.gitlab-ci/patch.sh -r patches gluon
# Bring gluon repo to cacheable state
- ./.gitlab-ci/build.sh -c clean -b $CI_COMMIT_REF_NAME -n $CI_PIPELINE_ID -m "$MAKEOPTS" 2>&1 | tee -a debug.log
- ./.gitlab-ci/build.sh -c clean -b stable -n $CI_PIPELINE_ID -m "$MAKEOPTS" 2>&1 | tee -a debug.log
# Sign (not in Nord)
#- echo $SIGNING_KEY > signing_key
#- ./.gitlab-ci/build.sh -c sign -b $CI_COMMIT_REF_NAME -s $(pwd)/signing_key
#- ./.gitlab-ci/build.sh -c sign -b stable -s $(pwd)/signing_key
artifacts:
untracked: false
paths:
......@@ -79,7 +79,7 @@ upload:
- ssh-add <(echo "$SSH_KEY")
# create fake gluon dir to satisfy build script
- mkdir -p gluon
- ./.gitlab-ci/build.sh -c upload -b $CI_COMMIT_REF_NAME -n $CI_PIPELINE_ID
- ./.gitlab-ci/build.sh -c upload -b experimental -n $CI_PIPELINE_ID
dependencies:
- build
cache: {}
......@@ -383,12 +383,6 @@ upload() {
ln -sf \
"${DEPLOYMENT_PATH}/${TARGET}/${RELEASE}/factory" \
"${DEPLOYMENT_PATH}/${TARGET}/"
${SSH} \
${DEPLOYMENT_USER}@${DEPLOYMENT_SERVER} \
-- \
ln -sf \
"${DEPLOYMENT_PATH}/${TARGET}/${RELEASE}/other" \
"${DEPLOYMENT_PATH}/${TARGET}/"
}
prepare() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment