From a1eb2e7afbf0a5403e61fa2c9fd30cf6fe7dfdfb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Oct 2023 03:53:01 +0000 Subject: [PATCH 1/3] Bump github/branch-deploy from 7.2.1 to 8.1.0 Bumps [github/branch-deploy](https://github.com/github/branch-deploy) from 7.2.1 to 8.1.0. - [Release notes](https://github.com/github/branch-deploy/releases) - [Commits](https://github.com/github/branch-deploy/compare/v7.2.1...v8.1.0) --- updated-dependencies: - dependency-name: github/branch-deploy dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/branch-deploy.yml | 2 +- .github/workflows/deploy.yml | 2 +- .github/workflows/unlock-on-merge.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/branch-deploy.yml b/.github/workflows/branch-deploy.yml index b47a198d..27641ddd 100644 --- a/.github/workflows/branch-deploy.yml +++ b/.github/workflows/branch-deploy.yml @@ -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 diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index c73fc7f6..2e282ebb 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -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" diff --git a/.github/workflows/unlock-on-merge.yml b/.github/workflows/unlock-on-merge.yml index 61765b45..b8db8f66 100644 --- a/.github/workflows/unlock-on-merge.yml +++ b/.github/workflows/unlock-on-merge.yml @@ -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 From 5e7c696a44bc6b4aacd5766593baf953a450b9e6 Mon Sep 17 00:00:00 2001 From: Grant Birkinbine Date: Mon, 16 Oct 2023 22:00:00 -0600 Subject: [PATCH 2/3] bump actions versions --- .github/workflows/branch-deploy.yml | 6 +++--- .github/workflows/deploy.yml | 2 +- .github/workflows/new-pr.yml | 4 ++-- .github/workflows/test.yml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/branch-deploy.yml b/.github/workflows/branch-deploy.yml index 27641ddd..28711e54 100644 --- a/.github/workflows/branch-deploy.yml +++ b/.github/workflows/branch-deploy.yml @@ -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 }} @@ -55,7 +55,7 @@ jobs: environment: "development" # Post comment on PR with development deploy info - - uses: GrantBirki/comment@v2.0.6 + - uses: GrantBirki/comment@v2.0.7 if: ${{ steps.branch-deploy.outputs.continue == 'true' && steps.branch-deploy.outputs.noop != 'true' && steps.branch-deploy.outputs.environment == 'development' }} @@ -81,7 +81,7 @@ jobs: apiToken: ${{ secrets.CF_API_TOKEN }} # Post comment on PR with production deploy info - - uses: GrantBirki/comment@v2.0.6 + - uses: GrantBirki/comment@v2.0.7 if: ${{ steps.branch-deploy.outputs.continue == 'true' && steps.branch-deploy.outputs.noop != 'true' && steps.branch-deploy.outputs.environment == 'production' }} diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 2e282ebb..c8f08857 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -31,7 +31,7 @@ jobs: steps: - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: setup node uses: actions/setup-node@v3 diff --git a/.github/workflows/new-pr.yml b/.github/workflows/new-pr.yml index abf611d1..9fed21a9 100644 --- a/.github/workflows/new-pr.yml +++ b/.github/workflows/new-pr.yml @@ -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/comment@v2.0.6 + uses: GrantBirki/comment@v2.0.7 continue-on-error: true with: file: .github/new-pr-comment.md diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7ce56bf6..b4581dae 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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 From 58e02ec39e6ab72f8e365515eac563342659eea9 Mon Sep 17 00:00:00 2001 From: Grant Birkinbine Date: Mon, 16 Oct 2023 22:02:36 -0600 Subject: [PATCH 3/3] shortName fix in CI --- script/ci/Tarkov.dev.postman_collection.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/ci/Tarkov.dev.postman_collection.json b/script/ci/Tarkov.dev.postman_collection.json index a321d1c0..e28f8adf 100644 --- a/script/ci/Tarkov.dev.postman_collection.json +++ b/script/ci/Tarkov.dev.postman_collection.json @@ -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",