From 6dd8b302531fcfee18cddedccf97d59edb1508b8 Mon Sep 17 00:00:00 2001 From: Norrie Taylor Date: Tue, 29 Sep 2026 15:48:03 -0700 Subject: [PATCH 1/3] ci: trigger the required lanes on merge_group A merge queue on main needs the five required aggregators to report on every queue commit. Each lane already gates its jobs on `github.event_name != 'pull_request' || ` and runs the dorny filter only on pull_request, so a queue commit runs the full set, which is what docs/ci-strategy.md section 5 prescribes for the queue. No job logic changes. --- .github/workflows/ci-linux-kvm.yml | 1 + .github/workflows/ci-linux-native.yml | 1 + .github/workflows/ci-macos.yml | 1 + .github/workflows/ci-shell-installer.yml | 1 + .github/workflows/ci.yml | 1 + 5 files changed, 5 insertions(+) diff --git a/.github/workflows/ci-linux-kvm.yml b/.github/workflows/ci-linux-kvm.yml index 4ec0db4837..31268bd2ca 100644 --- a/.github/workflows/ci-linux-kvm.yml +++ b/.github/workflows/ci-linux-kvm.yml @@ -23,6 +23,7 @@ on: branches: ["main", "release/**"] pull_request: branches: ["main", "release/**"] + merge_group: workflow_dispatch: env: diff --git a/.github/workflows/ci-linux-native.yml b/.github/workflows/ci-linux-native.yml index cf5ded0742..d9aaac09a3 100644 --- a/.github/workflows/ci-linux-native.yml +++ b/.github/workflows/ci-linux-native.yml @@ -25,6 +25,7 @@ on: branches: ["main", "release/**"] pull_request: branches: ["main", "release/**"] + merge_group: workflow_dispatch: env: diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml index 36e2249cf5..021bdc7e42 100644 --- a/.github/workflows/ci-macos.yml +++ b/.github/workflows/ci-macos.yml @@ -13,6 +13,7 @@ on: branches: ["main", "release/**"] pull_request: branches: ["main", "release/**"] + merge_group: workflow_dispatch: # Reusable so the nightly test tier can run the macOS/HVF e2e on a schedule # (nightly-tests.yml `macos-e2e`). On a scheduled call `github.event_name` diff --git a/.github/workflows/ci-shell-installer.yml b/.github/workflows/ci-shell-installer.yml index 4da414f33c..425011e845 100644 --- a/.github/workflows/ci-shell-installer.yml +++ b/.github/workflows/ci-shell-installer.yml @@ -16,6 +16,7 @@ name: CI shell installer on: pull_request: branches: ["main", "release/**"] + merge_group: push: branches: ["main", "release/**"] workflow_dispatch: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index caea89a6a4..1a19b3581a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,6 +12,7 @@ on: branches: ["main", "release/**"] pull_request: branches: ["main", "release/**"] + merge_group: workflow_dispatch: env: From 24e69623e24b5e1d5b8cff47b84c94a53e76277f Mon Sep 17 00:00:00 2001 From: Norrie Taylor Date: Thu, 1 Oct 2026 17:18:43 -0700 Subject: [PATCH 2/3] fix(minimald): fill box_addresses in the two test initializers main lost at merge T66 (#1789) added box_addresses to SessionConfig and SandboxLauncher; #1768 and #1765 each added an initializer without it on a base that predated the field, and their green lanes never re-ran against the merged main. The minimald test targets no longer compile on main; this fills the field the way every other initializer does. The merge queue this PR enables is what catches that class of stale green before it lands. --- crates/minimald/src/session/tests.rs | 1 + crates/minimald/src/session_host/tests.rs | 1 + 2 files changed, 2 insertions(+) diff --git a/crates/minimald/src/session/tests.rs b/crates/minimald/src/session/tests.rs index 13b0b4d78d..5880cea3ef 100644 --- a/crates/minimald/src/session/tests.rs +++ b/crates/minimald/src/session/tests.rs @@ -2676,6 +2676,7 @@ fn own_ip_session_req(name: &str) -> minimald_rpc::CreateSessionRequest { ..Default::default() }), }, + box_addresses: None, hooks_enabled: true, attrs: Default::default(), }, diff --git a/crates/minimald/src/session_host/tests.rs b/crates/minimald/src/session_host/tests.rs index 57450d5785..c8568cb2e6 100644 --- a/crates/minimald/src/session_host/tests.rs +++ b/crates/minimald/src/session_host/tests.rs @@ -2133,6 +2133,7 @@ fn launcher_in( ))), policy: sessions::SessionPolicy::default(), own_address: None, + box_addresses: None, composition: None, session: crate::session::WeakSessionHandle::dangling(), // The tests here drive the session's own launches unless one sets From be9ecf71ad170f0b56cc8206a4d67b9157761b69 Mon Sep 17 00:00:00 2001 From: Norrie Taylor Date: Thu, 1 Oct 2026 17:22:50 -0700 Subject: [PATCH 3/3] ci: pin the merge_group trigger to main and release branches The sibling push and pull_request triggers in all five lanes pin branches to main and release/**; the merge_group trigger now matches them, so a queue opened on any other branch does not run the lanes. --- .github/workflows/ci-linux-kvm.yml | 1 + .github/workflows/ci-linux-native.yml | 1 + .github/workflows/ci-macos.yml | 1 + .github/workflows/ci-shell-installer.yml | 1 + .github/workflows/ci.yml | 1 + 5 files changed, 5 insertions(+) diff --git a/.github/workflows/ci-linux-kvm.yml b/.github/workflows/ci-linux-kvm.yml index 31268bd2ca..680fb469ec 100644 --- a/.github/workflows/ci-linux-kvm.yml +++ b/.github/workflows/ci-linux-kvm.yml @@ -24,6 +24,7 @@ on: pull_request: branches: ["main", "release/**"] merge_group: + branches: ["main", "release/**"] workflow_dispatch: env: diff --git a/.github/workflows/ci-linux-native.yml b/.github/workflows/ci-linux-native.yml index 85cabad6a1..e3a5eabecb 100644 --- a/.github/workflows/ci-linux-native.yml +++ b/.github/workflows/ci-linux-native.yml @@ -26,6 +26,7 @@ on: pull_request: branches: ["main", "release/**"] merge_group: + branches: ["main", "release/**"] workflow_dispatch: env: diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml index bac9d0c83d..480d1a330c 100644 --- a/.github/workflows/ci-macos.yml +++ b/.github/workflows/ci-macos.yml @@ -14,6 +14,7 @@ on: pull_request: branches: ["main", "release/**"] merge_group: + branches: ["main", "release/**"] workflow_dispatch: # Reusable so the nightly test tier can run the macOS/HVF e2e on a schedule # (nightly-tests.yml `macos-e2e`). On a scheduled call `github.event_name` diff --git a/.github/workflows/ci-shell-installer.yml b/.github/workflows/ci-shell-installer.yml index 425011e845..1ee063bd0a 100644 --- a/.github/workflows/ci-shell-installer.yml +++ b/.github/workflows/ci-shell-installer.yml @@ -17,6 +17,7 @@ on: pull_request: branches: ["main", "release/**"] merge_group: + branches: ["main", "release/**"] push: branches: ["main", "release/**"] workflow_dispatch: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1a0faacf94..a3af753166 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,6 +13,7 @@ on: pull_request: branches: ["main", "release/**"] merge_group: + branches: ["main", "release/**"] workflow_dispatch: env: