diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml index 156eece..980313c 100644 --- a/.github/workflows/build-and-deploy.yml +++ b/.github/workflows/build-and-deploy.yml @@ -30,7 +30,6 @@ jobs: needs: test runs-on: ubuntu-latest permissions: - packages: write id-token: write steps: - name: Checkout code @@ -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 @@ -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 @@ -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 }}