Merge pull request #272 from navikt/til-main-branch

til-main-branch
navikt · Aug 21, 2023 · 5cea707 · 5cea707
2 parents 2126f95 + f571dd0
commit 5cea707
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -8,7 +8,7 @@ jobs:
   test:
     name: Run tests
     runs-on: ubuntu-latest
-    if: github.ref != 'refs/heads/master'
+    if: github.ref != 'refs/heads/main'
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -25,7 +25,7 @@ jobs:
   build-and-push:
     name: Build and push
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main'
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -51,7 +51,7 @@ jobs:
           tags: ${{ env.IMAGE }}:${{ env.IMAGE_TAG }}
   deploy-dev:
     name: Deploy application to dev
-    if: github.ref == 'refs/heads/dev'
+    if: github.ref == 'refs/heads/main'
     needs: build-and-push
     runs-on: ubuntu-latest
     steps:
@@ -66,8 +66,8 @@ jobs:
           VAR: version=${{ env.IMAGE_TAG }}
   deploy-prod:
     name: Deploy application to prod
-    if: github.ref == 'refs/heads/master'
-    needs: build-and-push
+    if: github.ref == 'refs/heads/main'
+    needs: deploy-dev
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -88,6 +88,6 @@ jobs:
         uses: softprops/action-gh-release@v1
         with:
           name: Release to prod
-          target_commitish: master
+          target_commitish: main
           tag_name: release/prod@${{ env.IMAGE_TAG }}
           prerelease: false