From 1d67989c2101adc2585c288d99a4f933667b00e7 Mon Sep 17 00:00:00 2001 From: Wolfram Gulde Date: Sun, 11 Jul 2021 00:06:12 +0200 Subject: [PATCH 1/7] feat(Branching): Adjustments for branching template --- pipelines/update-version-pipeline.gitlab-ci.yml | 1 + push-tag-and-version-template.gitlab-ci.yml | 4 +++- set-version-template.gitlab-ci.yml | 5 ++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pipelines/update-version-pipeline.gitlab-ci.yml b/pipelines/update-version-pipeline.gitlab-ci.yml index e8db94a..9466f32 100644 --- a/pipelines/update-version-pipeline.gitlab-ci.yml +++ b/pipelines/update-version-pipeline.gitlab-ci.yml @@ -11,6 +11,7 @@ include: variables: BUMP_VERSION: "major" + MODE: "bump" increase-version: stage: set-version diff --git a/push-tag-and-version-template.gitlab-ci.yml b/push-tag-and-version-template.gitlab-ci.yml index 57d13a6..5b05190 100644 --- a/push-tag-and-version-template.gitlab-ci.yml +++ b/push-tag-and-version-template.gitlab-ci.yml @@ -1,6 +1,8 @@ .push-tag-and-version: stage: push-tag-and-version - image: gitlab.exxcellent.de:4567/gilden/ci/exxcellent-ssh-tool:1.2.0 + image: gitlab.exxcellent.de:4567/gilden/ci/exxcellent-ssh-tool/snapshot:1.1.0_39583631 + # TODO wgu reactivate + #image: gitlab.exxcellent.de:4567/gilden/ci/exxcellent-ssh-tool:1.2.0 variables: ARTIFACT: "version" MVN_VERSION: "true" diff --git a/set-version-template.gitlab-ci.yml b/set-version-template.gitlab-ci.yml index decb960..e2ae7e6 100644 --- a/set-version-template.gitlab-ci.yml +++ b/set-version-template.gitlab-ci.yml @@ -1,12 +1,15 @@ .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/snapshot:2.2.0_fb297a5b + # TODO wgu: Restore + #image: gitlab.exxcellent.de:4567/gilden/ci/exxcellent-increase-version-tool:2.2.0 variables: BUMP_VERSION: "major" PREFIX: "" OUTPUT: version SIMPLIFY: "false" TAG: "false" + MODE: "bump" script: - increase-version artifacts: From 72abe3f094e00a764a53cd86166b7c2e1ebb5e0f Mon Sep 17 00:00:00 2001 From: Wolfram Gulde Date: Sun, 11 Jul 2021 00:20:19 +0200 Subject: [PATCH 2/7] feat(Branching): Adjustments for branching template 2 --- pipelines/update-version-pipeline.gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipelines/update-version-pipeline.gitlab-ci.yml b/pipelines/update-version-pipeline.gitlab-ci.yml index 9466f32..4d26872 100644 --- a/pipelines/update-version-pipeline.gitlab-ci.yml +++ b/pipelines/update-version-pipeline.gitlab-ci.yml @@ -4,7 +4,7 @@ stages: include: - project: 'gilden/ci/gitlab-ci-templates' - ref: 'master' + ref: 'feat/adjustments_for_branching_template' file: - 'set-version-template.gitlab-ci.yml' - 'push-tag-and-version-template.gitlab-ci.yml' From 8e4e07023483b1ff685d397597d7d182c24ea31d Mon Sep 17 00:00:00 2001 From: Wolfram Gulde Date: Tue, 13 Jul 2021 10:17:37 +0200 Subject: [PATCH 3/7] feat(Branching): change badge to support prerelease --- push-tag-and-version-template.gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/push-tag-and-version-template.gitlab-ci.yml b/push-tag-and-version-template.gitlab-ci.yml index 5b05190..d23414f 100644 --- a/push-tag-and-version-template.gitlab-ci.yml +++ b/push-tag-and-version-template.gitlab-ci.yml @@ -14,7 +14,7 @@ - echo $VERSION - pull - 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 --output $ARTIFACT.svg - > if [ "${MVN_VERSION}" == "true" ]; then mvn versions:set -DnewVersion=$VERSION -DgenerateBackupPoms=false From 820ec4b98bad71b725d6f5fc70b9846bd275b7fe Mon Sep 17 00:00:00 2001 From: Wolfram Gulde Date: Tue, 13 Jul 2021 10:26:13 +0200 Subject: [PATCH 4/7] feat(Branching): fix badge error --- push-tag-and-version-template.gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/push-tag-and-version-template.gitlab-ci.yml b/push-tag-and-version-template.gitlab-ci.yml index d23414f..45b13bb 100644 --- a/push-tag-and-version-template.gitlab-ci.yml +++ b/push-tag-and-version-template.gitlab-ci.yml @@ -14,7 +14,7 @@ - echo $VERSION - pull - echo $VERSION > $ARTIFACT - - curl https://img.shields.io/static/v1?label=Version-&message=$VERSION&color=green --output $ARTIFACT.svg + - curl "https://img.shields.io/static/v1?label=Version-&message=$VERSION&color=green" -o $ARTIFACT.svg - > if [ "${MVN_VERSION}" == "true" ]; then mvn versions:set -DnewVersion=$VERSION -DgenerateBackupPoms=false From f3eaf78067ba5dacb05b923311088864d204215f Mon Sep 17 00:00:00 2001 From: Wolfram Gulde Date: Tue, 13 Jul 2021 14:53:23 +0200 Subject: [PATCH 5/7] feat(Branching): adjust version for master merge --- pipelines/update-version-pipeline.gitlab-ci.yml | 2 +- push-tag-and-version-template.gitlab-ci.yml | 4 +--- set-version-template.gitlab-ci.yml | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pipelines/update-version-pipeline.gitlab-ci.yml b/pipelines/update-version-pipeline.gitlab-ci.yml index 4d26872..9466f32 100644 --- a/pipelines/update-version-pipeline.gitlab-ci.yml +++ b/pipelines/update-version-pipeline.gitlab-ci.yml @@ -4,7 +4,7 @@ stages: include: - project: 'gilden/ci/gitlab-ci-templates' - ref: 'feat/adjustments_for_branching_template' + ref: 'master' file: - 'set-version-template.gitlab-ci.yml' - 'push-tag-and-version-template.gitlab-ci.yml' diff --git a/push-tag-and-version-template.gitlab-ci.yml b/push-tag-and-version-template.gitlab-ci.yml index 45b13bb..ad1faf8 100644 --- a/push-tag-and-version-template.gitlab-ci.yml +++ b/push-tag-and-version-template.gitlab-ci.yml @@ -1,8 +1,6 @@ .push-tag-and-version: stage: push-tag-and-version - image: gitlab.exxcellent.de:4567/gilden/ci/exxcellent-ssh-tool/snapshot:1.1.0_39583631 - # TODO wgu reactivate - #image: gitlab.exxcellent.de:4567/gilden/ci/exxcellent-ssh-tool:1.2.0 + image: gitlab.exxcellent.de:4567/gilden/ci/exxcellent-ssh-tool:latest variables: ARTIFACT: "version" MVN_VERSION: "true" diff --git a/set-version-template.gitlab-ci.yml b/set-version-template.gitlab-ci.yml index e2ae7e6..ace4ee9 100644 --- a/set-version-template.gitlab-ci.yml +++ b/set-version-template.gitlab-ci.yml @@ -1,8 +1,6 @@ .set-version: stage: set-version - image: gitlab.exxcellent.de:4567/gilden/ci/exxcellent-increase-version-tool/snapshot:2.2.0_fb297a5b - # TODO wgu: Restore - #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:latest variables: BUMP_VERSION: "major" PREFIX: "" From bc28a50324416594d23c50da25ca852c638e4ab9 Mon Sep 17 00:00:00 2001 From: Fabian Widmann Date: Fri, 16 Jul 2021 10:22:44 +0200 Subject: [PATCH 6/7] chore(docs): fixate inc version tool to 3.0.0 --- set-version-template.gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/set-version-template.gitlab-ci.yml b/set-version-template.gitlab-ci.yml index ace4ee9..00056ae 100644 --- a/set-version-template.gitlab-ci.yml +++ b/set-version-template.gitlab-ci.yml @@ -1,6 +1,6 @@ .set-version: stage: set-version - image: gitlab.exxcellent.de:4567/gilden/ci/exxcellent-increase-version-tool:latest + image: gitlab.exxcellent.de:4567/gilden/ci/exxcellent-increase-version-tool:3.0.0 variables: BUMP_VERSION: "major" PREFIX: "" From 2048f6f9424958f7bd5580a10dce97e157354d38 Mon Sep 17 00:00:00 2001 From: Fabian Widmann Date: Fri, 16 Jul 2021 11:55:48 +0200 Subject: [PATCH 7/7] chore(docs): fixate ssh tool version to 1.2.0 --- push-tag-and-version-template.gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/push-tag-and-version-template.gitlab-ci.yml b/push-tag-and-version-template.gitlab-ci.yml index ad1faf8..e1686ba 100644 --- a/push-tag-and-version-template.gitlab-ci.yml +++ b/push-tag-and-version-template.gitlab-ci.yml @@ -1,6 +1,6 @@ .push-tag-and-version: stage: push-tag-and-version - image: gitlab.exxcellent.de:4567/gilden/ci/exxcellent-ssh-tool:latest + image: gitlab.exxcellent.de:4567/gilden/ci/exxcellent-ssh-tool:1.2.0 variables: ARTIFACT: "version" MVN_VERSION: "true"