From 70bfae4823498badb58cdf49e9013bd0ef5ac682 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Sun, 25 Aug 2024 22:11:34 -0400 Subject: [PATCH 1/5] Fix target repo for SS13 sync action --- .github/workflows/update-ss13-org-mirror.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/update-ss13-org-mirror.yml b/.github/workflows/update-ss13-org-mirror.yml index 175bffcd60..1c53bf94a6 100644 --- a/.github/workflows/update-ss13-org-mirror.yml +++ b/.github/workflows/update-ss13-org-mirror.yml @@ -21,6 +21,7 @@ jobs: id: app-token-generation uses: getsentry/action-github-app-token@d4b5da6c5e37703f8c3b3e43abb5705b46e159cc with: + repository: spacestation13/tgstation-server app_id: ${{ secrets.APP_ID }} private_key: ${{ secrets.APP_PRIVATE_KEY }} From c1acfd43b8b6d2ed2492a44ac45096636519eff1 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Mon, 26 Aug 2024 07:00:33 -0400 Subject: [PATCH 2/5] Fix Rerun Flaky Tests names --- .github/workflows/rerun-flaky-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rerun-flaky-tests.yml b/.github/workflows/rerun-flaky-tests.yml index 6b36c28751..c4181fa870 100644 --- a/.github/workflows/rerun-flaky-tests.yml +++ b/.github/workflows/rerun-flaky-tests.yml @@ -1,4 +1,4 @@ -name: Rerun Flaky Live Tests +name: Rerun Flaky Tests on: workflow_run: workflows: ["CI Pipeline", "CI Security"] From 8c67cf5e6579fff8d7e3eb3fae4fea2e5d7d1a73 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Mon, 26 Aug 2024 07:08:19 -0400 Subject: [PATCH 3/5] Remove unnecessary permissions blocks --- .github/workflows/ci-security.yml | 2 -- .github/workflows/size-label.yml | 3 --- 2 files changed, 5 deletions(-) diff --git a/.github/workflows/ci-security.yml b/.github/workflows/ci-security.yml index 6dd80b8f54..3c4b4f55dc 100644 --- a/.github/workflows/ci-security.yml +++ b/.github/workflows/ci-security.yml @@ -20,8 +20,6 @@ jobs: name: Check CI Clearance if: github.event_name == 'pull_request_target' && (github.event.pull_request.head.repo.id != github.event.pull_request.base.repo.id || github.event.pull_request.user.id == 49699333) && github.event.pull_request.state == 'open' runs-on: ubuntu-latest - permissions: - pull-requests: write steps: - name: Generate App Token id: app-token-generation diff --git a/.github/workflows/size-label.yml b/.github/workflows/size-label.yml index 69b51c5e52..c95dab8236 100644 --- a/.github/workflows/size-label.yml +++ b/.github/workflows/size-label.yml @@ -9,9 +9,6 @@ concurrency: jobs: size-label: name: Add Size Label - permissions: - contents: read - pull-requests: write runs-on: ubuntu-latest steps: - name: Generate App Token From 57e9e98cd83e7e3195ae8f6ab93a72113303df81 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Mon, 26 Aug 2024 07:09:28 -0400 Subject: [PATCH 4/5] .yml formatting --- .github/workflows/ci-security.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-security.yml b/.github/workflows/ci-security.yml index 3c4b4f55dc..ee8c4d54ae 100644 --- a/.github/workflows/ci-security.yml +++ b/.github/workflows/ci-security.yml @@ -6,7 +6,11 @@ on: - dev - master pull_request_target: - types: [opened, reopened, labeled, synchronize] + types: + - opened + - reopened + - labeled + - synchronize branches: - dev - master From 1bca65b8a99ed7672fe6569479f35716e2bad4d0 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Mon, 26 Aug 2024 07:09:52 -0400 Subject: [PATCH 5/5] Fix issue with size labelling cancelling CI Security --- .github/workflows/size-label.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/size-label.yml b/.github/workflows/size-label.yml index c95dab8236..7ab774153c 100644 --- a/.github/workflows/size-label.yml +++ b/.github/workflows/size-label.yml @@ -1,6 +1,10 @@ name: Size Labelling on: pull_request_target: + types: + - reopened + - labeled + - synchronize concurrency: group: "size-labelling-${{ github.head_ref || github.run_id }}-${{ github.event_name }}"