ci: add Mergify merge queue, drop trunk push runs (#10317)

This commit is contained in:
Connor Fitzgerald authored and GitHub committed 2026-09-12 19:28:53 -04:00
1 parent f0333904d0
commit 11734dbc47
8 files changed
+53 -48

No files matched your search

+31
View File
@@ -0,0 +1,31 @@
# Mergify merge queue configuration.
# Reference: https://docs.mergify.com/configuration/file-format/
#
# Pull requests enter the queue with the `@mergifyio queue` command.
# A pull request goes to the first queue rule whose `queue_conditions`
# match. Required checks and approvals come from branch protection.
merge_queue:
queued_label: "queue: queued"
dequeued_label: "queue: dequeued"
queue_rules:
- name: rebase
queue_conditions:
- 'label = "merge: rebase"'
merge_method: rebase
update_method: rebase
- name: squash
queue_conditions:
- '-label = "merge: rebase"'
merge_method: squash
update_method: rebase
commit_message_format:
title: inherit
body: inherit
commands_restrictions:
queue:
conditions:
- sender-permission >= write
+8 -8
View File
@@ -1,14 +1,12 @@
name: CI
on:
push:
branches-ignore: [
# Branches with the `gh-readonly-queue` prefix are used by the
# merge queue, so they are already covered by the `merge_group` event.
"gh-readonly-queue/**",
]
pull_request:
merge_group:
# Runs on `trunk` to save the build caches that pull requests read
# and to upload the coverage baseline.
schedule:
- cron: "0 6 * * *"
workflow_dispatch:
env:
#
@@ -788,7 +786,9 @@ jobs:
- name: Upload coverage report to Codecov
uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7
if: steps.coverage.outcome == 'success'
# Mergify draft pull requests re-run the tests of already-reported
# pull requests, so their coverage is not uploaded.
if: steps.coverage.outcome == 'success' && !startsWith(github.head_ref, 'mergify/merge-queue/')
with:
files: lcov.info
token: ${{ secrets.CODECOV_TOKEN }}
+4 -7
View File
@@ -1,14 +1,11 @@
name: CTS
on:
push:
branches-ignore: [
# Branches with the `gh-readonly-queue` prefix are used by the
# merge queue, so they are already covered by the `merge_group` event.
"gh-readonly-queue/**",
]
pull_request:
merge_group:
# Runs on `trunk` to save the build caches that pull requests read.
schedule:
- cron: "0 6 * * *"
workflow_dispatch:
env:
#
+1 -6
View File
@@ -2,13 +2,8 @@ name: Docs
on:
push:
branches-ignore: [
# Branches with the `gh-readonly-queue` prefix are used by the
# merge queue, so they are already covered by the `merge_group` event.
"gh-readonly-queue/**",
]
branches: [trunk, "firefox*"]
pull_request:
merge_group:
env:
# This is the MSRV used by all repository infrastructure.
+4 -7
View File
@@ -1,14 +1,11 @@
name: cargo-generate
on:
push:
branches-ignore: [
# Branches with the `gh-readonly-queue` prefix are used by the
# merge queue, so they are already covered by the `merge_group` event.
"gh-readonly-queue/**",
]
pull_request:
merge_group:
# Runs on `trunk` to save the build caches that pull requests read.
schedule:
- cron: "0 6 * * *"
workflow_dispatch:
env:
#
-7
View File
@@ -2,14 +2,7 @@
name: Lazy
on:
push:
branches-ignore: [
# Branches with the `gh-readonly-queue` prefix are used by the
# merge queue, so they are already covered by the `merge_group` event.
"gh-readonly-queue/**",
]
pull_request:
merge_group:
env:
CARGO_INCREMENTAL: false
+1 -6
View File
@@ -2,13 +2,8 @@ name: Publish
on:
push:
branches-ignore: [
# Branches with the `gh-readonly-queue` prefix are used by the
# merge queue, so they are already covered by the `merge_group` event.
"gh-readonly-queue/**",
]
branches: [trunk, "firefox*"]
pull_request:
merge_group:
env:
CARGO_INCREMENTAL: false
+4 -7
View File
@@ -1,14 +1,11 @@
name: Shaders
on:
push:
branches-ignore: [
# Branches with the `gh-readonly-queue` prefix are used by the
# merge queue, so they are already covered by the `merge_group` event.
"gh-readonly-queue/**",
]
pull_request:
merge_group:
# Runs on `trunk` to save the build caches that pull requests read.
schedule:
- cron: "0 6 * * *"
workflow_dispatch:
# Every time a PR is pushed to, cancel any previous jobs. This
# makes us behave nicer to github and get faster turnaround times