feat(Branching): adjust version for master merge

This commit is contained in:
Wolfram Gulde 2021-07-13 14:53:23 +02:00
parent 820ec4b98b
commit f3eaf78067
3 changed files with 3 additions and 7 deletions

View File

@ -4,7 +4,7 @@ stages:
include: include:
- project: 'gilden/ci/gitlab-ci-templates' - project: 'gilden/ci/gitlab-ci-templates'
ref: 'feat/adjustments_for_branching_template' ref: 'master'
file: file:
- 'set-version-template.gitlab-ci.yml' - 'set-version-template.gitlab-ci.yml'
- 'push-tag-and-version-template.gitlab-ci.yml' - 'push-tag-and-version-template.gitlab-ci.yml'

View File

@ -1,8 +1,6 @@
.push-tag-and-version: .push-tag-and-version:
stage: push-tag-and-version stage: push-tag-and-version
image: gitlab.exxcellent.de:4567/gilden/ci/exxcellent-ssh-tool/snapshot:1.1.0_39583631 image: gitlab.exxcellent.de:4567/gilden/ci/exxcellent-ssh-tool:latest
# TODO wgu reactivate
#image: gitlab.exxcellent.de:4567/gilden/ci/exxcellent-ssh-tool:1.2.0
variables: variables:
ARTIFACT: "version" ARTIFACT: "version"
MVN_VERSION: "true" MVN_VERSION: "true"

View File

@ -1,8 +1,6 @@
.set-version: .set-version:
stage: set-version stage: set-version
image: gitlab.exxcellent.de:4567/gilden/ci/exxcellent-increase-version-tool/snapshot:2.2.0_fb297a5b image: gitlab.exxcellent.de:4567/gilden/ci/exxcellent-increase-version-tool:latest
# TODO wgu: Restore
#image: gitlab.exxcellent.de:4567/gilden/ci/exxcellent-increase-version-tool:2.2.0
variables: variables:
BUMP_VERSION: "major" BUMP_VERSION: "major"
PREFIX: "" PREFIX: ""