Merge branch 'master' into release

statisticsnorway · Oct 13, 2024 · a16fec6 · a16fec6
2 parents c1f0785 + a89b9f9
commit a16fec6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git 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

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>no.ssb.maskinporten</groupId>
   <artifactId>maskinporten-guardian</artifactId>
-  <version>1.3.19-SNAPSHOT</version>
+  <version>1.3.20-SNAPSHOT</version>
   <packaging>${packaging}</packaging>
 
   <parent>