Skip to content

Revert merge_group CI triggers: merge queue unavailable on this repo#194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BigSimmo merged 1 commit into from
Jul 2, 2026
Merged

Revert merge_group CI triggers: merge queue unavailable on this repo #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
Expand Down
16 changes: 0 additions & 16 deletions .github/workflows/secret-scan.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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:
Expand All@@ -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."
Loading