From 8a67a8d0cdbed377d3307a990539e8025ef4f040 Mon Sep 17 00:00:00 2001 From: FabianK3 <21039694+FabianK3@users.noreply.github.com> Date: Thu, 4 Jun 2026 14:50:33 +0200 Subject: [PATCH] Revert "Refactor do-not-merge CI check to run on merge queue" (#22595) Reverts Aurorastation/Aurora.3#22444 GitHub actions are being funny, this apparently doesn't work like that. --- .github/workflows/enforce_merge_blockers.yaml | 5 ++--- .../fabiank3-refactore-prevent-merge-ci-check.yml | 6 ------ 2 files changed, 2 insertions(+), 9 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 024e0480b15..b579d6d115e 100644 --- a/.github/workflows/enforce_merge_blockers.yaml +++ b/.github/workflows/enforce_merge_blockers.yaml @@ -1,9 +1,8 @@ name: "'Do Not Merge' Blockers" on: - merge_group: - branches: - - master + 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."