slår sammen deploy

.github/workflows/master.yml

@@ -23,30 +23,19 @@ jobs:
     outputs:
       image: ${{ steps.docker-build-push.outputs.image }}
 
-  deployDev:
-    name: Deploy to dev
-    needs: [build]
+  deploy:
+    name: deploy
+    needs: build
     runs-on: ubuntu-latest
-    env:
-      IMAGE: "${{ needs.build.outputs.image }}"
+    strategy:
+      fail-fast: false
+      matrix:
+        cluster: [dev-gcp, prod-gcp]
     steps:
       - uses: actions/checkout@v4
       - uses: nais/deploy/actions/deploy@v1
         env:
           APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
-          CLUSTER: dev-gcp
-          RESOURCE: deploy/dev.yml
-
-  deployProd:
-    name: Deploy to prod
-    needs: [build, deployDev]
-    runs-on: ubuntu-latest
-    env:
-      IMAGE: "${{ needs.build.outputs.image }}"
-    steps:
-      - uses: actions/checkout@v4
-      - uses: nais/deploy/actions/deploy@v1
-        env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
-          CLUSTER: prod-gcp
-          RESOURCE: deploy/prod.yml
+          CLUSTER: ${{ matrix.cluster }}
+          RESOURCE: deploy/${{ matrix.cluster }}.yml
+          IMAGE: ${{ needs.build.outputs.image }}