From 262b55ac1a2f19e22b0ed725e6d877a10210cc45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20H=C3=A5kon?=
 <55088511+torhakon@users.noreply.github.com>
Date: Sat, 28 Dec 2024 21:38:49 +0100
Subject: [PATCH] Gi nytt navn til action

---
 ...MainBuildAndPublish.yml => buildAndPublish.yml} | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
 rename .github/workflows/{ciMainBuildAndPublish.yml => buildAndPublish.yml} (74%)

diff --git a/.github/workflows/ciMainBuildAndPublish.yml b/.github/workflows/buildAndPublish.yml
similarity index 74%
rename from .github/workflows/ciMainBuildAndPublish.yml
rename to .github/workflows/buildAndPublish.yml
index 6dac629..1ac84a7 100644
--- a/.github/workflows/ciMainBuildAndPublish.yml
+++ b/.github/workflows/buildAndPublish.yml
@@ -1,16 +1,15 @@
-name: "MAIN - Build and Publish"
+name: "Build and Publish"
 on:
   workflow_run:
     workflows: ["Run static code validation"]
     types:
       - completed
-    branches:
-      - main
 jobs:
   buildAndPublish:
+    name: Build and Publish
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
     runs-on: ubuntu-latest
-    container: ghcr.io/flxbl-io/sfp:latest
+    container: ghcr.io/flxbl-io/sfp:${{ vars.SFP_CONTAINER_VERSION }}
     permissions:
       contents: write
       packages: write
@@ -21,6 +20,7 @@ jobs:
           fetch-depth: 0
 
       - uses: navikt/sf-platform/.github/actions/authenticateNode@main
+        if: ${{ github.ref_name == 'refs/heads/main' }}
 
       - uses: navikt/sf-platform/.github/actions/authenticateOrg@main
         with:
@@ -37,7 +37,13 @@ jobs:
 
       - uses: navikt/sf-platform/.github/actions/build@main
 
+      # - uses: navikt/sf-platform/.github/actions/publishArtifact@main
+      #   if: ${{ github.ref_name == 'refs/heads/main' }}
+      #   with:
+      #     nodeToken: ${{ secrets.GITHUB_TOKEN }}
+
       - uses: navikt/sf-platform/.github/actions/uploadWorkflowArtifactsAndLogs@main
+        if: always()
         with:
           artifactName: "build-artifacts"
           uploadArtifacts: true