Splitt deploy workflows, fiks permissions og kun deploy til prod fra main.

Author: GardOS

.github/workflows/main.yaml

@@ -23,9 +23,9 @@ env:
 jobs:
   build:
     name: Build
+    if: github.ref == 'refs/heads/main' # Only deploy to prod from main branch
     permissions:
       contents: read
-      packages: write
       id-token: write
     uses: navikt/familie-baks-gha-workflows/.github/workflows/build-yarn-app.yaml@main
     with:

.github/workflows/manual-deploy.yaml .github/workflows/manual-deploy-dev.yaml

@@ -1,14 +1,7 @@
-name: Manual deploy
+name: Manual deploy to dev
 on:
   workflow_dispatch:
     inputs:
-      environment:
-        description: "Environment to deploy to"
-        required: true
-        type: choice
-        options:
-          - dev
-          - prod
       skip-tests:
         description: 'Skip tests?'
         default: false
@@ -26,7 +19,6 @@ jobs:
     name: Build
     permissions:
       contents: read
-      packages: write
       id-token: write
     uses: navikt/familie-baks-gha-workflows/.github/workflows/build-yarn-app.yaml@main
     with:
@@ -44,6 +36,6 @@ jobs:
     uses: navikt/familie-baks-gha-workflows/.github/workflows/deploy.yaml@main
     with:
       image: ${{ needs.build.outputs.image }}
-      cluster: ${{ inputs.environment }}-gcp
-      resource: .nais/app-${{ inputs.environment }}.yaml
+      cluster: dev-gcp
+      resource: .nais/app-dev.yaml
     secrets: inherit

.github/workflows/manual-deploy-prod.yaml

@@ -0,0 +1,42 @@
+name: Manual deploy to prod (from main)
+on:
+  workflow_dispatch:
+    inputs:
+      skip-tests:
+        description: 'Skip tests?'
+        default: false
+        type: boolean
+      skip-validation:
+        description: 'Skip validation? (eslint, prettier, typecheck)'
+        default: false
+        type: boolean
+
+env:
+  BASE_PATH: /barnetrygd/soknad/
+
+jobs:
+  build:
+    name: Build
+    if: github.ref == 'refs/heads/main' # Only deploy to prod from main branch
+    permissions:
+      contents: read
+      id-token: write
+    uses: navikt/familie-baks-gha-workflows/.github/workflows/build-yarn-app.yaml@main
+    with:
+      build-image: true
+      push-image: true
+      skip-tests: ${{ inputs.skip-tests }}
+      skip-validation: ${{ inputs.skip-validation }}
+      base-path: ${{ env.BASE_PATH }}
+    secrets: inherit
+  deploy-with-new-image:
+    name: Deploy with new image
+    permissions:
+      id-token: write
+    needs: [ build ]
+    uses: navikt/familie-baks-gha-workflows/.github/workflows/deploy.yaml@main
+    with:
+      image: ${{ needs.build.outputs.image }}
+      cluster: prod-gcp
+      resource: .nais/app-prod.yaml
+    secrets: inherit