Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions .github/workflows/audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@ name: Security audit

on:
push:
branches-ignore:
- 'gh-readonly-queue/**'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why remove the merge queue avoidance? It seems like we should ignore those too?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The queue refs are still skipped, just implicitly now. The merge queue branches are named gh-readonly-queue/<base>/pr-<n>-<sha>, which matches neither main nor branch-*, so push no longer fires for them and the queue keeps getting its single run from merge_group.

Also, GitHub rejects branches and branches-ignore on the same event.

# Feature branches get CI from pull_request, so push runs only the long-lived branches.
branches:
- main
- 'branch-*'
paths:
- '**/Cargo.toml'
- '**/Cargo.lock'
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,10 @@ name: Rust

on:
push:
# When PR is in the Merge Queue, GitHub will create a temporary branch - but we already have a
# CI running because of `merge_group`
# See also: https://github.com/orgs/community/discussions/15254
branches-ignore:
- 'gh-readonly-queue/**'
# Feature branches get CI from pull_request, so push runs only the long-lived branches.
branches:
- main
- 'branch-*'
pull_request:
merge_group:

Expand Down
Loading