Skip to content
This repository has been archived by the owner on Dec 14, 2023. It is now read-only.

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
poroshinaleksei committed Nov 28, 2023
1 parent 5eb8202 commit c15c94c
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions .github/workflows/build-and-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ jobs:
needs: test
runs-on: ubuntu-latest
permissions:
packages: write
id-token: write
steps:
- name: Checkout code
Expand Down Expand Up @@ -58,8 +57,6 @@ jobs:
if: startsWith(github.ref, 'refs/heads/dev-') || startsWith(github.ref, 'refs/heads/master') # Build and push docker if branch is either master or dev-*
needs: build-code-and-push-docker # Depends on build-code-and-push-docker job
runs-on: ubuntu-latest
permissions:
packages: write
steps:
- uses: actions/checkout@v4
- uses: nais/deploy/actions/deploy@v1
Expand All @@ -68,15 +65,13 @@ jobs:
CLUSTER: dev-gcp
RESOURCE: nais/naiserator.yml
VARS: nais/dev-gcp.json
IMAGE: ${{ steps.docker-push.outputs.image }}
IMAGE: ${{ steps.build-code-and-push-docker.outputs.image }}

deploy-prod-gcp:
name: deploy-prod-gcp
if: startsWith(github.ref, 'refs/heads/master')
needs: build-code-and-push-docker # Depends on build-code-and-push-docker job
runs-on: ubuntu-latest
permissions:
packages: write
steps:
- uses: actions/checkout@v3
- uses: nais/deploy/actions/deploy@v1
Expand All @@ -85,3 +80,4 @@ jobs:
CLUSTER: prod-gcp
RESOURCE: nais/naiserator.yml
VARS: nais/prod-gcp.json
IMAGE: ${{ steps.build-code-and-push-docker.outputs.image }}

0 comments on commit c15c94c

Please sign in to comment.