Skip to content

Commit

Permalink
Merge pull request #240 from the-hideout/dependabot/github_actions/gi…
Browse files Browse the repository at this point in the history
…thub/branch-deploy-8.1.0

Bump github/branch-deploy from 7.2.1 to 8.1.0
  • Loading branch information
GrantBirki authored Oct 17, 2023
2 parents 37f990e + 58e02ec commit 1424b9a
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/branch-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: github/branch-deploy@v7.4.0
- uses: github/branch-deploy@v8.1.0
id: branch-deploy
with:
admins: the-hideout/core-contributors
Expand All @@ -29,7 +29,7 @@ jobs:

- name: checkout
if: ${{ steps.branch-deploy.outputs.continue == 'true' }}
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ steps.branch-deploy.outputs.ref }}

Expand All @@ -55,7 +55,7 @@ jobs:
environment: "development"

# Post comment on PR with development deploy info
- uses: GrantBirki/[email protected].6
- uses: GrantBirki/[email protected].7
if: ${{ steps.branch-deploy.outputs.continue == 'true' &&
steps.branch-deploy.outputs.noop != 'true' &&
steps.branch-deploy.outputs.environment == 'development' }}
Expand All @@ -81,7 +81,7 @@ jobs:
apiToken: ${{ secrets.CF_API_TOKEN }}

# Post comment on PR with production deploy info
- uses: GrantBirki/[email protected].6
- uses: GrantBirki/[email protected].7
if: ${{ steps.branch-deploy.outputs.continue == 'true' &&
steps.branch-deploy.outputs.noop != 'true' &&
steps.branch-deploy.outputs.environment == 'production' }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
steps:
# https://github.com/github/branch-deploy/blob/d3c24bd92505e623615b75ffdfac5ed5259adbdb/docs/merge-commit-strategy.md
- name: deployment check
uses: github/branch-deploy@v7.4.0
uses: github/branch-deploy@v8.1.0
id: deployment-check
with:
merge_deploy_mode: "true"
Expand All @@ -31,7 +31,7 @@ jobs:

steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: setup node
uses: actions/setup-node@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/new-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:

steps:
# Comment on new PR requests with deployment instructions
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: comment
uses: GrantBirki/[email protected].6
uses: GrantBirki/[email protected].7
continue-on-error: true
with:
file: .github/new-pr-comment.md
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: setup node
uses: actions/setup-node@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unlock-on-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

steps:
- name: unlock on merge
uses: github/branch-deploy@v7.4.0
uses: github/branch-deploy@v8.1.0
id: unlock-on-merge
with:
unlock_on_merge_mode: "true" # <-- indicates that this is the "Unlock on Merge Mode" workflow
Expand Down
2 changes: 1 addition & 1 deletion script/ci/Tarkov.dev.postman_collection.json
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,7 @@
"});\r",
"\r",
"pm.test(\"correct item shortName\", function () {\r",
" pm.expect(pm.response.json().data.itemsByName[0].shortName).to.eq(\"Car batt.\");\r",
" pm.expect(pm.response.json().data.itemsByName[0].shortName).to.eq(\"Car battery\");\r",
"});\r",
"\r",
"pm.test(\"correct item common number types\", function () {\r",
Expand Down

0 comments on commit 1424b9a

Please sign in to comment.