Flytte workflows til å kjøære fra dedikert push workflow

Author: torhakon

.github/workflows/buildAndPublish.yml

@@ -1,28 +1,12 @@
 name: "Build and Publish"
 on:
   workflow_call:
-  workflow_dispatch:
-  workflow_run:
-    workflows: ["Run static code validation"]
-    types:
-      - completed
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 jobs:
   checkChanges:
     name: Check changes
-    # Always run on workflow call and workflow dispatch
-    # Only run on workflow_run if there has been a change in the src folder,
-    # excluding markdown files
-    if: ${{
-      github.event_name == 'workflow_call' ||
-      github.event_name == 'workflow_dispatch' ||
-      (
-      github.event_name == 'workflow_run' &&
-      github.event.workflow_run.conclusion == 'success'
-      )
-      }}
     runs-on: ubuntu-latest
     outputs:
       continueWorkflow: ${{ steps.checkChanges.outputs.continueWorkflow }}
@@ -32,7 +16,6 @@ jobs:
       - name: "Checkout"
         uses: actions/checkout@v4
         with:
-          ref: ${{ github.event_name == 'workflow_run' && github.event.workflow_run.head_branch || github.ref_name }}
           fetch-depth: 2
 
       - name: "Check for changes in src folder"
@@ -51,15 +34,7 @@ jobs:
 
           echo "${yellow}Checking if there has been changes to source code by running git diff on the src folder excluding markdown files${reset}"
 
-          if [ "$GITHUB_EVENT_NAME" == "workflow_run" ]; then
-            GIT_REF="${{ github.event.workflow_run.head_branch }}"
-          else
-            GIT_REF="${{ github.ref_name }}"
-          fi
-
-          echo "Using GIT_REF: $GIT_REF"
-
-          changes=$(git diff "$GIT_REF^" "$GIT_REF" --ignore-all-space --name-only -- src/)
+          changes=$(git diff "${{ github.ref_name }}^" "${{ github.ref_name }}" --ignore-all-space --name-only -- src/)
           nonMarkdownChanges=""
           continueWorkflow=true
 
@@ -99,7 +74,8 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          ref: ${{ github.event_name == 'workflow_run' && github.event.workflow_run.head_branch || github.ref_name }}
+          # ref: ${{ github.event_name == 'workflow_run' && github.event.workflow_run.head_branch || github.ref_name }}
+          ref: ${{ github.ref_name }}
 
       - name: "Set Git Config"
         run: |
@@ -108,8 +84,8 @@ jobs:
           git config --system --add safe.directory "$GITHUB_WORKSPACE"
 
       - name: Authenticate node
+        if: ${{ github.ref_name == 'main' }}
         uses: navikt/sf-platform/.github/actions/authenticateNode@main
-        if: ${{ (github.event_name == 'workflow_run' && github.event.workflow_run.head_branch == 'main') || github.ref_name }}
 
       - name: Authenticate DevHub
         uses: navikt/sf-platform/.github/actions/authenticateOrg@main
@@ -123,8 +99,8 @@ jobs:
         with:
           devhub: "devhub"
           pools: "ciPlatform"
-          ref: ${{ (github.event_name == 'workflow_run' && github.event.workflow_run.event == 'pull_request') && github.event.workflow_run.head_sha || '' }}
-          baseRef: ${{ (github.event_name == 'workflow_run' && github.event.workflow_run.event == 'pull_request') && github.event.workflow_run.pull_requests.base.sha || '' }}
+          ref: ${{ github.event_name == 'pull_request' && github.sha || '' }}
+          baseRef: ${{ github.event_name == 'pull_request' && github.sha || '' }}
 
       - name: Quick build
         uses: navikt/sf-platform/.github/actions/ciQuickBuild@main
@@ -133,30 +109,30 @@ jobs:
         uses: navikt/sf-platform/.github/actions/build@main
 
       - name: Publish artifacts
+        if: ${{ github.ref_name == 'main' }}
         uses: navikt/sf-platform/.github/actions/publishArtifact@main
-        if: ${{ (github.event_name == 'workflow_run' && github.event.workflow_run.head_branch == 'main') || github.ref_name == 'main' }}
         with:
           nodeToken: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Generate Release Name
-        if: ${{ (github.event_name == 'workflow_run' && github.event.workflow_run.head_branch == 'main') || github.ref_name == 'main' }}
+        if: ${{ github.ref_name == 'main' }}
         id: generate_name
         run: |
           echo "releaseName=sf-platform_$(date +%s%3N)" >> $GITHUB_OUTPUT
 
       - name: Generate Release Definition
-        if: ${{ (github.event_name == 'workflow_run' && github.event.workflow_run.head_branch == 'main') || github.ref_name == 'main' }}
+        if: ${{ github.ref_name == 'main' }}
         uses: navikt/sf-platform/.github/actions/generateReleaseDefinition@main
         with:
-          branchToCommitTo: ${{ github.event_name == 'workflow_run' && github.event.workflow_run.head_branch || github.ref_name }}
-          gitRef: ${{ github.event_name == 'workflow_run' && github.event.workflow_run.head_sha || github.sha }}
+          branchToCommitTo: ${{ github.ref_name }}
+          gitRef: ${{ github.sha }}
           pathToConfigFile: config/releaseConfig.yml
           releaseName: ${{ steps.generate_name.outputs.releaseName }}
           directory: "release-definition"
 
       - name: Upload artifacts and logs
-        uses: navikt/sf-platform/.github/actions/uploadWorkflowArtifactsAndLogs@main
         if: always()
+        uses: navikt/sf-platform/.github/actions/uploadWorkflowArtifactsAndLogs@main
         with:
           artifactName: "build-artifacts"
           uploadArtifacts: true

.github/workflows/ciStaticCodeValidation.yml

@@ -1,6 +1,6 @@
 name: "Run static code validation"
 on:
-  push:
+  # push:
   workflow_call:
     inputs:
       validateEntireRepo:
@@ -35,9 +35,9 @@ jobs:
           echo "GIT_REF=${{ github.event.inputs.gitRef || github.ref }}" >> $GITHUB_ENV
           echo "VALIDATE_ENTIRE_REPO=${{ github.event.inputs.validateEntireRepo }}" >> $GITHUB_ENV
 
-          if [ "${{ github.event_name }}" == "push" ]; then
-            echo "VALIDATE_ENTIRE_REPO=false" >> $GITHUB_ENV
-          fi
+          # if [ "${{ github.event_name }}" == "push" ]; then
+          #   echo "VALIDATE_ENTIRE_REPO=false" >> $GITHUB_ENV
+          # fi
 
       - name: "Install SF CLI"
         uses: navikt/sf-platform/.github/actions/installSfCli@main

.github/workflows/onPush.yml

@@ -0,0 +1,12 @@
+name: On PUSH
+on:
+  push:
+jobs:
+  staticCodeValidation:
+    uses: navikt/sf-platform/.github/workflows/ciStaticCodeValidation.yml@main
+    with:
+      # As we're not working with legacy we want to have everything in ship shape
+      validateEntireRepo: "true"
+  buildAndPublish:
+    needs: staticCodeValidation
+    uses: navikt/sf-platform/.github/workflows/buildAndPublish.yml@main