Skip to content

Commit

Permalink
Merge branch 'dependabot/github_actions/dot-github/workflows/nais/dep…
Browse files Browse the repository at this point in the history
…loy-2' into DependabotSamleBranch
  • Loading branch information
OdaDahlen committed Jan 9, 2024
2 parents e155a56 + 3a21604 commit b7a0e0d
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-deploy-feature-branch-q1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Deploy application
uses: nais/deploy/actions/deploy@v1
uses: nais/deploy/actions/deploy@v2
env:
APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
CLUSTER: dev-fss
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-alerts-to-prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
uses: actions/checkout@v4

- name: Deploy to prod-fss
uses: nais/deploy/actions/deploy@v1
uses: nais/deploy/actions/deploy@v2
env:
APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY_OBO }}
CLUSTER: prod-fss
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-unleash-api-token.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Deploy unleash-apitoken
uses: nais/deploy/actions/deploy@v1
uses: nais/deploy/actions/deploy@v2
env:
APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
CLUSTER: dev-fss
Expand All @@ -33,7 +33,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Deploy unleash-apitoken
uses: nais/deploy/actions/deploy@v1
uses: nais/deploy/actions/deploy@v2
if: github.ref == 'refs/heads/master'
env:
APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Deploy application
uses: nais/deploy/actions/deploy@v1
uses: nais/deploy/actions/deploy@v2
env:
APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
CLUSTER: dev-fss
Expand All @@ -77,7 +77,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Deploy application
uses: nais/deploy/actions/deploy@v1
uses: nais/deploy/actions/deploy@v2
env:
APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
CLUSTER: prod-fss
Expand Down

0 comments on commit b7a0e0d

Please sign in to comment.