Bruk trunk-based

Author: LudvigHz

.github/workflows/main.yml

@@ -9,7 +9,7 @@ jobs:
   build:
     name: Test and build
     runs-on: ubuntu-latest
-    if: github.ref != 'refs/heads/dev' && github.ref != 'refs/heads/master'
+    if: github.ref != 'refs/heads/master'
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK 21
@@ -30,7 +30,7 @@ jobs:
 
   build-and-push:
     name: Build and push Docker container
-    if: github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/master'
     runs-on: ubuntu-latest
     permissions:
       packages: write
@@ -60,8 +60,9 @@ jobs:
   deploy-dev:
     name: Deploy to dev-gcp
     needs: build-and-push
-    if: github.ref == 'refs/heads/dev'
+    if: github.ref == 'refs/heads/master'
     runs-on: ubuntu-latest
+    environment: dev-gcp
     permissions:
       contents: read
       id-token: write
@@ -79,6 +80,7 @@ jobs:
     needs: build-and-push
     if: github.ref == 'refs/heads/master'
     runs-on: ubuntu-latest
+    environment: prod-gcp
     permissions:
       contents: read
       id-token: write
@@ -89,4 +91,4 @@ jobs:
           PRINT_PAYLOAD: true
           CLUSTER: prod-gcp
           RESOURCE: .nais/prod.yml
-          VAR: image=${{ needs.build-and-push.outputs.image }}
+          VAR: image=${{ needs.build-and-push.outputs.image }}