Update github workflow

navikt · Sep 3, 2024 · 8b9584a · 8b9584a
1 parent 362a8b4
commit 8b9584a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/deploy-unleash-api-token.yaml b/.github/workflows/deploy-unleash-api-token.yaml
@@ -31,13 +31,13 @@ jobs:
   deploy-prod:
     name: Deploy unleash-apitoken to prod
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/flytte-til-gcp'
+    if: github.ref == 'refs/heads/master'
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Deploy unleash-apitoken
         uses: nais/deploy/actions/deploy@v2
-        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/flytte-til-gcp'
+        if: github.ref == 'refs/heads/master'
         env:
           CLUSTER: prod-gcp
           RESOURCE: .nais/application/gcp/unleash-apitoken-prod.yaml

diff --git a/.github/workflows/main-gcp.yml b/.github/workflows/main-gcp.yml
@@ -11,7 +11,7 @@ jobs:
   test:
     name: Run tests
     runs-on: ubuntu-latest
-    if: github.ref != 'refs/heads/flytte-til-gcp'
+    if: github.ref != 'refs/heads/master'
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -32,7 +32,7 @@ jobs:
   build-and-push:
     name: Build and push
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/flytte-til-gcp'
+    if: github.ref == 'refs/heads/dev'
     outputs:
       image: ${{ steps.docker-build-push.outputs.image }}
     steps:
@@ -59,7 +59,7 @@ jobs:
 
   deploy-dev:
     name: Deploy application to dev gcp
-    if: github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/flytte-til-gcp'
+    if: github.ref == 'refs/heads/dev'
     needs: build-and-push
     runs-on: ubuntu-latest
     steps:
@@ -75,7 +75,7 @@ jobs:
 
   deploy-prod:
     name: Deploy application to prod gcp
-    if: github.ref == 'refs/heads/flytte-til-gcp'
+    if: github.ref == 'refs/heads/master'
     needs: build-and-push
     runs-on: ubuntu-latest
     steps: