Skip to content

Commit

Permalink
Bump nais/deploy from 1 to 2 (#115)
Browse files Browse the repository at this point in the history
* Bump nais/deploy from 1 to 2

Bumps [nais/deploy](https://github.com/nais/deploy) from 1 to 2.
- [Release notes](https://github.com/nais/deploy/releases)
- [Commits](nais/deploy@v1...v2)

---
updated-dependencies:
- dependency-name: nais/deploy
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

* Fikser deploy v2.

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ramin Esfandiari <[email protected]>
  • Loading branch information
dependabot[bot] and ramrock93 authored Jan 2, 2024
1 parent 3e58af0 commit 95a3c9a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
10 changes: 6 additions & 4 deletions .github/workflows/apply-alerts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@ jobs:
name: Deploy to dev-gcp
if: startsWith(github.ref, 'refs/heads/dev-') || startsWith(github.ref, 'refs/heads/main') # Deploy if branch is either master or dev-*
runs-on: ubuntu-latest
permissions:
id-token: write
steps:
- uses: actions/checkout@v4
- uses: nais/deploy/actions/deploy@v1
- uses: nais/deploy/actions/deploy@v2
env:
APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
CLUSTER: dev-gcp
RESOURCE: nais/alerterator-dev.yml
VARS: nais/dev-gcp.json
Expand All @@ -29,11 +30,12 @@ jobs:
name: Deploy to prod-gcp
if: startsWith(github.ref, 'refs/heads/main') # If the branch is master
runs-on: ubuntu-latest
permissions:
id-token: write
steps:
- uses: actions/checkout@v4
- uses: nais/deploy/actions/deploy@v1
- uses: nais/deploy/actions/deploy@v2
env:
APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
CLUSTER: prod-gcp
RESOURCE: nais/alerterator-prod.yml
VARS: nais/prod-gcp.json
1 change: 1 addition & 0 deletions .github/workflows/build-and-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ jobs:
uses: navikt/sif-gha-workflows/.github/workflows/gradle-deploy.yml@main
permissions:
contents: read
id-token: write
secrets: inherit
with:
image: ${{ needs.build.outputs.image }}
Expand Down

0 comments on commit 95a3c9a

Please sign in to comment.