Do some post-merge cleanups

This commit is contained in:
Sven-Hendrik Haase 2020-10-25 05:28:23 +01:00
parent 4f076e8624
commit d7eb0c91c1
No known key found for this signature in database
GPG Key ID: 39E4B877E62EB915

View File

@ -46,7 +46,6 @@ rootfs:
extends: .rootfs extends: .rootfs
except: except:
- master - master
- add-base-devel-tags
- schedules - schedules
- tags - tags
parallel: parallel:
@ -61,7 +60,6 @@ rootfs:secure:
- secure - secure
only: only:
- master - master
- add-base-devel-tags
- schedules - schedules
except: except:
- tags - tags
@ -87,7 +85,6 @@ image:build:
extends: .image extends: .image
except: except:
- master - master
- add-base-devel-tags
- schedules - schedules
- tags - tags
parallel: parallel:
@ -102,7 +99,6 @@ image:build:secure:
- secure - secure
only: only:
- master - master
- add-base-devel-tags
- schedules - schedules
except: except:
- tags - tags
@ -189,7 +185,7 @@ release:
- > - >
curl -sSf --request POST curl -sSf --request POST
--header "PRIVATE-TOKEN: ${GITLAB_PROJECT_TOKEN}" --header "PRIVATE-TOKEN: ${GITLAB_PROJECT_TOKEN}"
--form "branch=add-base-devel-tags" --form "branch=master"
--form "commit_message=Release ${BUILD_VERSION}" --form "commit_message=Release ${BUILD_VERSION}"
--form "actions[][action]=update" --form "actions[][action]=update"
--form "actions[][file_path]=ci/base/Dockerfile" --form "actions[][file_path]=ci/base/Dockerfile"
@ -212,7 +208,7 @@ release:
# But it doesn't appear that those downloads are public. I consider this a bug and hopefully it's fixed in a future version! # But it doesn't appear that those downloads are public. I consider this a bug and hopefully it's fixed in a future version!
echo "Creating release" echo "Creating release"
release-cli create --name "Release ${BUILD_VERSION}" --description "Release ${BUILD_VERSION}" \ release-cli create --name "Release ${BUILD_VERSION}" --description "Release ${BUILD_VERSION}" \
--tag-name v${BUILD_VERSION} --ref "add-base-devel-tags" \ --tag-name v${BUILD_VERSION} --ref "master" \
--assets-link "{\"name\":\"base-${BUILD_VERSION}.tar.xz\",\"url\":\"${base_url}\"}" \ --assets-link "{\"name\":\"base-${BUILD_VERSION}.tar.xz\",\"url\":\"${base_url}\"}" \
--assets-link "{\"name\":\"base-${BUILD_VERSION}.tar.xz.SHA256\",\"url\":\"${base_sha_url}\"}" \ --assets-link "{\"name\":\"base-${BUILD_VERSION}.tar.xz.SHA256\",\"url\":\"${base_sha_url}\"}" \
--assets-link "{\"name\":\"base-devel-${BUILD_VERSION}.tar.xz\",\"url\":\"${base_devel_url}\"}" \ --assets-link "{\"name\":\"base-devel-${BUILD_VERSION}.tar.xz\",\"url\":\"${base_devel_url}\"}" \