Merge pull request #2425 from statisticsnorway/develop

Prodløft
statisticsnorway · Jan 11, 2024 · 6d8d22a · 6d8d22a
2 parents 14121ea + bae98a1
commit 6d8d22a
Show file tree

Hide file tree

Showing 14 changed files with 546 additions and 632 deletions.
diff --git a/.github/workflows/deploy_nais.yaml b/.github/workflows/deploy_nais.yaml
@@ -28,7 +28,7 @@ jobs:
       - name: Upload artifacts
         id: upload_artifacts
         if: success()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: mimir-nais-${{ github.run_number }}
           path: "./build/libs/*.jar"
@@ -59,7 +59,7 @@ jobs:
           path: "ssbno-xp-docker"
           repository: "statisticsnorway/ssbno-xp-docker"
       - name: Download artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: mimir-nais-${{ github.run_number }}
           path: "./ssbno-xp-docker"
@@ -76,23 +76,23 @@ jobs:
 
       - id: "auth"
         name: "Authenticate to Google Cloud"
-        uses: "google-github-actions/auth@v0.6.0"
+        uses: "google-github-actions/auth@v2.0.0"
         with:
           workload_identity_provider: "projects/906675412832/locations/global/workloadIdentityPools/ssb-identity-pool/providers/github-oidc-provider"
           service_account: "gh-ssb@nais-management-b3a7.iam.gserviceaccount.com"
           token_format: "access_token"
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
       - name: Login to registry
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: "oauth2accesstoken"
           password: "${{ steps.auth.outputs.access_token }}"
       - name: Docker meta
         id: metadata
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE }}
           # Docker tags based on the following events/attributes
@@ -106,7 +106,7 @@ jobs:
             type=sha
             type=raw,value=${{ env.TAG }}, enable=true
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: ./ssbno-xp-docker
           file: "./ssbno-xp-docker/Dockerfile"
@@ -130,7 +130,7 @@ jobs:
           ISSUE_NUMBER=$(echo $ISSUE_NUMBER | tr '[:upper:]' '[:lower:]')
           echo "ISSUE_NUMBER=${ISSUE_NUMBER}" >> $GITHUB_ENV;
           echo "Issue number: $ISSUE_NUMBER";
-      - uses: nais/deploy/actions/deploy@v1
+      - uses: nais/deploy/actions/deploy@v2
         env:
           APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: staging

diff --git a/.github/workflows/deploy_to_prod.yaml b/.github/workflows/deploy_to_prod.yaml
@@ -30,7 +30,7 @@ jobs:
       - name: Upload artifacts
         id: upload_artifacts
         if: success()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: mimir-prod-${{ github.run_number }}
           path: "./build/libs/*.jar"

diff --git a/.github/workflows/deploy_to_qa.yaml b/.github/workflows/deploy_to_qa.yaml
@@ -30,7 +30,7 @@ jobs:
       - name: Upload artifacts
         id: upload_artifacts
         if: success()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: mimir-qa-${{ github.run_number }}
           path: './build/libs/*.jar'

diff --git a/.github/workflows/deploy_to_test.yaml b/.github/workflows/deploy_to_test.yaml
@@ -30,7 +30,7 @@ jobs:
       - name: Upload artifacts
         id: upload_artifacts
         if: success()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: mimir-test-${{ github.run_number }}
           path: "./build/libs/*.jar"

diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 # Gradle Project settings
 projectName = mimir
-version = 2.1.1
+version = 2.1.2
 
 # XP App values
 appDisplayName = Mimir application