Merge branch 'feat/branching_fixes' into 'master'

Feat/branching fixes

See merge request gilden/ci/gitlab-ci-templates!12
This commit is contained in:
Fabian Widmann 2021-07-16 11:21:46 +00:00
commit 70f0f24b5d
3 changed files with 4 additions and 2 deletions

View File

@ -11,6 +11,7 @@ include:
variables: variables:
BUMP_VERSION: "major" BUMP_VERSION: "major"
MODE: "bump"
increase-version: increase-version:
stage: set-version stage: set-version

View File

@ -12,7 +12,7 @@
- echo $VERSION - echo $VERSION
- pull - pull
- echo $VERSION > $ARTIFACT - echo $VERSION > $ARTIFACT
- curl https://img.shields.io/badge/Version-$VERSION-green.svg --output $ARTIFACT.svg - curl "https://img.shields.io/static/v1?label=Version-&message=$VERSION&color=green" -o $ARTIFACT.svg
- > - >
if [ "${MVN_VERSION}" == "true" ]; then if [ "${MVN_VERSION}" == "true" ]; then
mvn versions:set -DnewVersion=$VERSION -DgenerateBackupPoms=false mvn versions:set -DnewVersion=$VERSION -DgenerateBackupPoms=false

View File

@ -1,12 +1,13 @@
.set-version: .set-version:
stage: set-version stage: set-version
image: gitlab.exxcellent.de:4567/gilden/ci/exxcellent-increase-version-tool:2.2.0 image: gitlab.exxcellent.de:4567/gilden/ci/exxcellent-increase-version-tool:3.0.0
variables: variables:
BUMP_VERSION: "major" BUMP_VERSION: "major"
PREFIX: "" PREFIX: ""
OUTPUT: version OUTPUT: version
SIMPLIFY: "false" SIMPLIFY: "false"
TAG: "false" TAG: "false"
MODE: "bump"
script: script:
- increase-version - increase-version
artifacts: artifacts: