From c30db036568efb31741179d37ff29e2c2da95868 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Mon, 3 Feb 2025 09:57:21 +1100 Subject: [PATCH 1/6] Add CI step to run Danger on `linter` queue from Buildkite --- .buildkite/pipeline.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index b452a7b7b..70df68910 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -63,3 +63,13 @@ steps: plugins: [*docker_plugin] agents: queue: "default" + + - label: "☢️ Danger - PR Check" + command: danger + key: danger + if: build.pull_request.id != null + retry: + manual: + permit_on_passed: true + agents: + queue: linter From 436f293dc45c4331510d95c3185a717eff094fb1 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Mon, 3 Feb 2025 09:59:47 +1100 Subject: [PATCH 2/6] Add RuboCop linter in CI --- .buildkite/pipeline.yml | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 70df68910..420f58e44 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -64,12 +64,21 @@ steps: agents: queue: "default" - - label: "☢️ Danger - PR Check" - command: danger - key: danger - if: build.pull_request.id != null - retry: - manual: - permit_on_passed: true - agents: - queue: linter + - group: "Linters" + steps: + - label: ☢️ Danger - PR Check + command: danger + key: danger + if: build.pull_request.id != null + retry: + manual: + permit_on_passed: true + agents: + queue: linter + + - label: ":rubocop: Rubocop" + command: rubocop + key: rubocop + if: build.pull_request.id != null + agents: + queue: linter From e9bd90840f0738e331f09f2835e7367b21edd2a4 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Mon, 3 Feb 2025 10:01:42 +1100 Subject: [PATCH 3/6] Update Danger GitHub workflow to match new Buildkite setup --- .github/workflows/run-danger.yml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/run-danger.yml b/.github/workflows/run-danger.yml index 85d1675d0..7ea30d492 100644 --- a/.github/workflows/run-danger.yml +++ b/.github/workflows/run-danger.yml @@ -1,13 +1,18 @@ -name: ☢️ Danger +name: ☢️ Trigger Danger On Buildkite on: pull_request: - types: [opened, reopened, ready_for_review, synchronize, edited, review_requested, review_request_removed, labeled, unlabeled, milestoned, demilestoned] + types: [labeled, unlabeled, milestoned, demilestoned] jobs: dangermattic: - # runs on draft PRs only for opened / synchronize events - if: ${{ (github.event.pull_request.draft == false) || (github.event.pull_request.draft == true && contains(fromJSON('["opened", "synchronize"]'), github.event.action)) }} - uses: Automattic/dangermattic/.github/workflows/reusable-run-danger.yml@v1.0.0 + if: ${{ (github.event.pull_request.draft == false) }} + uses: Automattic/dangermattic/.github/workflows/reusable-retry-buildkite-step-on-events.yml@v1.2.2 + with: + org-slug: automattic + pipeline-slug: release-toolkit + retry-step-key: danger + build-commit-sha: ${{ github.event.pull_request.head.sha }} + cancel-running-github-jobs: false secrets: - github-token: ${{ secrets.DANGERMATTIC_GITHUB_TOKEN }} + buildkite-api-token: ${{ secrets.TRIGGER_BK_BUILD_TOKEN }} From b349ad4442f7bb3b119a3670600b36a86022f011 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Tue, 4 Feb 2025 07:45:34 +1100 Subject: [PATCH 4/6] Update triggers in `run-danger.yml` Co-authored-by: Ian G. Maia --- .github/workflows/run-danger.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-danger.yml b/.github/workflows/run-danger.yml index 7ea30d492..1f23da021 100644 --- a/.github/workflows/run-danger.yml +++ b/.github/workflows/run-danger.yml @@ -2,7 +2,7 @@ name: ☢️ Trigger Danger On Buildkite on: pull_request: - types: [labeled, unlabeled, milestoned, demilestoned] + types: [labeled, unlabeled, milestoned, demilestoned, review_requested, review_request_removed] jobs: dangermattic: From c570bde889c08eb12d77bab48ac1a53ef31a276b Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Tue, 4 Feb 2025 07:46:27 +1100 Subject: [PATCH 5/6] Use rolling tag in GHA workflow, `v1` over `v1.2.2` Co-authored-by: Ian G. Maia --- .github/workflows/run-danger.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-danger.yml b/.github/workflows/run-danger.yml index 1f23da021..e770ece36 100644 --- a/.github/workflows/run-danger.yml +++ b/.github/workflows/run-danger.yml @@ -7,7 +7,7 @@ on: jobs: dangermattic: if: ${{ (github.event.pull_request.draft == false) }} - uses: Automattic/dangermattic/.github/workflows/reusable-retry-buildkite-step-on-events.yml@v1.2.2 + uses: Automattic/dangermattic/.github/workflows/reusable-retry-buildkite-step-on-events.yml@v1 with: org-slug: automattic pipeline-slug: release-toolkit From fa5d404ffb63ad87b329503a33c248771abb2b6a Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Tue, 4 Feb 2025 07:52:29 +1100 Subject: [PATCH 6/6] Reintroduce `ready_for_review` trigger --- .github/workflows/run-danger.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-danger.yml b/.github/workflows/run-danger.yml index e770ece36..d6c9977a4 100644 --- a/.github/workflows/run-danger.yml +++ b/.github/workflows/run-danger.yml @@ -2,7 +2,7 @@ name: ☢️ Trigger Danger On Buildkite on: pull_request: - types: [labeled, unlabeled, milestoned, demilestoned, review_requested, review_request_removed] + types: [labeled, unlabeled, milestoned, demilestoned, ready_for_review, review_requested, review_request_removed] jobs: dangermattic: