From a3e6e38eb0ea2e0c16ed947035729a52dbb4edd5 Mon Sep 17 00:00:00 2001
From: "dapla-bot[bot]" <143391972+dapla-bot[bot]@users.noreply.github.com>
Date: Sun, 13 Oct 2024 21:53:09 +0000
Subject: [PATCH 1/3] [maven-release-plugin] prepare release 1.3.19
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index c096a93..bcb6db6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
4.0.0
no.ssb.maskinporten
maskinporten-guardian
- 1.3.19-SNAPSHOT
+ 1.3.19
${packaging}
@@ -31,7 +31,7 @@
scm:git:https://github.com/${github.repository}.git
https://github.com/${github.repository}
- 1.3.17
+ 1.3.19
From 1c57e3755f81f819bdc2bfedeaa061fb9dfaa585 Mon Sep 17 00:00:00 2001
From: "dapla-bot[bot]" <143391972+dapla-bot[bot]@users.noreply.github.com>
Date: Sun, 13 Oct 2024 21:53:10 +0000
Subject: [PATCH 2/3] [maven-release-plugin] prepare for next development
iteration
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index bcb6db6..f1bdfcd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
4.0.0
no.ssb.maskinporten
maskinporten-guardian
- 1.3.19
+ 1.3.20-SNAPSHOT
${packaging}
@@ -31,7 +31,7 @@
scm:git:https://github.com/${github.repository}.git
https://github.com/${github.repository}
- 1.3.19
+ 1.3.17
From a89b9f94eb8bed825c05cbc92fac9379bf3455ee Mon Sep 17 00:00:00 2001
From: Michael Moen Allport
Date: Sun, 13 Oct 2024 23:58:07 +0200
Subject: [PATCH 3/3] fix ref tag
---
.github/workflows/build-deploy.yml | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/build-deploy.yml b/.github/workflows/build-deploy.yml
index c060922..fd2baac 100644
--- a/.github/workflows/build-deploy.yml
+++ b/.github/workflows/build-deploy.yml
@@ -36,9 +36,10 @@ jobs:
id: image-tag
run: |
if [ ${{ github.event_name }} == "release" ]; then
- semver=${REGISTRY}/${IMAGE}:v${GITHUB_REF}
- major_minor_version=${REGISTRY}/${IMAGE}:v$(echo "$GITHUB_REF" | cut -d'.' -f1-2)
- major_version=${REGISTRY}/${IMAGE}:v$(echo "$GITHUB_REF" | cut -d'.' -f1)
+ RELEASE_VERSION=${GITHUB_REF#refs/*/}
+ semver=${REGISTRY}/${IMAGE}:v${RELEASE_VERSION}
+ major_minor_version=${REGISTRY}/${IMAGE}:v$(echo "$RELEASE_VERSION" | cut -d'.' -f1-2)
+ major_version=${REGISTRY}/${IMAGE}:v$(echo "$RELEASE_VERSION" | cut -d'.' -f1)
latest=${REGISTRY}/${IMAGE}:latest
## NAIS image is the image used by NAIS for deployment