Fikser opp i workflows, bruker omsorgspenger som inspirasjon

Author: mbolstad

.github/workflows/build-master.yaml

@@ -9,6 +9,7 @@ on:
       - '.gitignore'
       - 'LICENSE'
       - 'CODEOWNERS'
+  workflow_dispatch:
 
 jobs:
   codeql:
@@ -20,7 +21,7 @@ jobs:
       security-events: write
     secrets: inherit
     with:
-      readertoken: false
+      javaversion: 21
       package-command: './gradlew clean build -x test'
       branch: master
 
@@ -30,7 +31,7 @@ jobs:
       contents: read
     secrets: inherit
     with:
-      readertoken: false
+      javaversion: 21
 
   build:
     uses: navikt/sif-gha-workflows/.github/workflows/gradle-build.yml@main
@@ -40,8 +41,7 @@ jobs:
     secrets: inherit
     with:
       team: k9saksbehandling
-      dockercontext: .
-      readertoken: false
+      javaversion: 21
 
   trivy:
     needs: [ build ]
@@ -61,8 +61,9 @@ jobs:
     uses: navikt/sif-gha-workflows/.github/workflows/gradle-deploy.yml@main
     permissions:
       contents: read
+      id-token: write
     secrets: inherit
     with:
       image: ${{ needs.build.outputs.image }}
       environment: fss
-      deploy-prod: ${{ startsWith(github.ref, 'refs/heads/master') }}
+      deploy-prod: false

.github/workflows/build-pull-request.yaml

@@ -1,6 +1,8 @@
-name: Build Pull Request
+name: Build Branch
 on:
-  pull_request:
+  push:
+    branches-ignore:
+      - master
     paths-ignore:
       - '**.md'
       - '**.MD'
@@ -15,4 +17,4 @@ jobs:
       contents: read
     secrets: inherit
     with:
-      readertoken: false
+      javaversion: 21