From 709a7065cfc56928967d96469a6ab12baf628a3f Mon Sep 17 00:00:00 2001 From: BigSimmo <87357024+BigSimmo@users.noreply.github.com> Date: Thu, 2 Jul 2026 22:55:43 +0800 Subject: [PATCH] Revert merge_group CI triggers (#183): merge queue unavailable Merge queue can't be enabled on this repo (private + user-owned; GitHub gates the feature to public repos and org-owned repos on Team/Enterprise), so the merge_group triggers added in #183 are dead config that no queue will ever fire. Restore ci.yml and secret-scan.yml to their pre-#183 state, which also drops the now-unnecessary gitleaks merge_group guard. The strict up-to-date ruleset policy has been reverted to OFF separately, returning to the velocity-friendly setup that suits this high-churn repo. Required checks (verify, Gitleaks, ui-smoke) remain enforced. Co-Authored-By: Claude Fable 5 --- .github/workflows/ci.yml | 3 --- .github/workflows/secret-scan.yml | 16 ---------------- 2 files changed, 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b720179076..b9d9698bd7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,9 +5,6 @@ on: branches: [main, "release/**"] pull_request: branches: [main, "release/**"] - # Required so verify + ui-smoke run on merge-queue entries; without this the - # queue would never receive these checks and enqueued PRs would hang. - merge_group: workflow_dispatch: schedule: - cron: "0 18 * * 0" diff --git a/.github/workflows/secret-scan.yml b/.github/workflows/secret-scan.yml index 4ecc2290a7..cd49c707f6 100644 --- a/.github/workflows/secret-scan.yml +++ b/.github/workflows/secret-scan.yml @@ -5,9 +5,6 @@ on: branches: [main, "release/**"] pull_request: branches: [main, "release/**"] - # Required so Gitleaks runs on merge-queue entries; without this the queue - # would never receive this check and enqueued PRs would hang. - merge_group: workflow_dispatch: concurrency: @@ -31,20 +28,7 @@ jobs: fetch-depth: 0 persist-credentials: false - # gitleaks-action@v3's supportedEvents excludes merge_group; on that event - # it exits with "ERROR: The [merge_group] event is not yet supported", - # which would make the required Gitleaks check fail for every queued PR. - # Run the action for push/pull_request/dispatch, where the real scan - # happens before a PR can enter the queue. - name: Scan for secrets - if: github.event_name != 'merge_group' uses: gitleaks/gitleaks-action@v3 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - # In the merge queue, secrets were already scanned at pull_request time and - # merging already-scanned commits cannot introduce new secret material, so - # this satisfies the required Gitleaks check without the unsupported event. - - name: Secret scan (merge queue) - if: github.event_name == 'merge_group' - run: echo "Secrets scanned at pull_request time; gitleaks-action does not support merge_group, so the queue relies on that scan."