Muliggjør manuell release av pensjon-brevbaker-api-model (#1291)

* Muliggjør versjonering av pensjon-brevbaker-api-model fra CLI * Endre workflow for release av pensjon-brevbaker-api-model for manuel kjøring
navikt · Feb 14, 2025 · 04409d6 · 04409d6
1 parent eb934b2
commit 04409d6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/.github/workflows/brevbaker-api-model.yaml b/.github/workflows/brevbaker-api-model.yaml
@@ -1,5 +1,6 @@
 name: "Build and release pensjon-brevbaker-api-model"
 on:
+  workflow_dispatch:
   pull_request:
     branches:
       - "main"
@@ -61,7 +62,7 @@ jobs:
     permissions:
       packages: write
     needs: [ release-common, changes ]
-    if: ${{ always() && (needs.release-common.result == 'success' || needs.release-common.result == 'skipped') }}
+    if: ${{ always() && (needs.release-common.result == 'success' || needs.release-common.result == 'skipped' || github.event_name == 'workflow_dispatch') }}
     steps:
       - uses: "actions/checkout@v4"
       - uses: "gradle/actions/wrapper-validation@v4"
@@ -79,5 +80,10 @@ jobs:
       - name: "Release maven artifact"
         if:  ${{ github.ref == 'refs/heads/main' && needs.changes.outputs.pensjonsbrev == 'true' }}
         run: "./gradlew :pensjon-brevbaker-api-model:publish"
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+      - name: "Release maven manually"
+        if: github.event_name == 'workflow_dispatch' && github.ref != 'refs/heads/main'
+        run: ./gradlew -Pversion="$(TZ="Europe/Oslo" date +%Y.%m.%d-%H.%M)-$(git rev-parse --short=12 HEAD)" :pensjon-brevbaker-api-model:publish
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/.tool-versions b/.tool-versions
@@ -1 +1,2 @@
 nodejs 20.9.0
+java temurin-21.0.6+7.0.LTS
diff --git a/pensjon-brevbaker-api-model/build.gradle.kts b/pensjon-brevbaker-api-model/build.gradle.kts
@@ -10,7 +10,6 @@ plugins {
 }
 
 group = "no.nav.pensjon.brev"
-version = "123"
 
 java {
     withSourcesJar()

diff --git a/pensjon-brevbaker-api-model/gradle.properties b/pensjon-brevbaker-api-model/gradle.properties
@@ -0,0 +1 @@
+version=123-SNAPSHOT
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,6 @@ plugins { @@
     }
     group = "no.nav.pensjon.brev"
-    version = "123"
     java {
         withSourcesJar()
@@ Expand Down @@