From 2a24e31aff2e5e6fda9845a0cfa166c45e65fd3b Mon Sep 17 00:00:00 2001 From: Arrow768 <1331699+Arrow768@users.noreply.github.com> Date: Sat, 9 May 2026 23:43:38 +0200 Subject: [PATCH] Revert "Refactor do-not-merge CI check to run on merge queue" (#22441) Reverts Aurorastation/Aurora.3#22436 --- .github/workflows/enforce_merge_blockers.yaml | 3 ++- .../fabiank3-refactore-prevent-merge-ci-check.yml | 6 ------ 2 files changed, 2 insertions(+), 7 deletions(-) delete mode 100644 html/changelogs/fabiank3-refactore-prevent-merge-ci-check.yml diff --git a/.github/workflows/enforce_merge_blockers.yaml b/.github/workflows/enforce_merge_blockers.yaml index c74c16227b9..b579d6d115e 100644 --- a/.github/workflows/enforce_merge_blockers.yaml +++ b/.github/workflows/enforce_merge_blockers.yaml @@ -1,7 +1,8 @@ name: "'Do Not Merge' Blockers" on: - merge_group: + pull_request: + types: [synchronize, opened, labeled, unlabeled] jobs: donotmerge-blocker: diff --git a/html/changelogs/fabiank3-refactore-prevent-merge-ci-check.yml b/html/changelogs/fabiank3-refactore-prevent-merge-ci-check.yml deleted file mode 100644 index 62f55ae91f0..00000000000 --- a/html/changelogs/fabiank3-refactore-prevent-merge-ci-check.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: FabianK3 - -delete-after: True - -changes: - - refactor: "Update the do-not-merge GitHub CI check to fail on merge, not while the PR is open."