diff --git a/.github/workflows/ci-linux-kvm.yml b/.github/workflows/ci-linux-kvm.yml index 4ec0db4837..680fb469ec 100644 --- a/.github/workflows/ci-linux-kvm.yml +++ b/.github/workflows/ci-linux-kvm.yml @@ -23,6 +23,8 @@ on: branches: ["main", "release/**"] 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 d3f202062a..e3a5eabecb 100644 --- a/.github/workflows/ci-linux-native.yml +++ b/.github/workflows/ci-linux-native.yml @@ -25,6 +25,8 @@ on: branches: ["main", "release/**"] 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 a957fb2de5..480d1a330c 100644 --- a/.github/workflows/ci-macos.yml +++ b/.github/workflows/ci-macos.yml @@ -13,6 +13,8 @@ on: branches: ["main", "release/**"] 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 4da414f33c..1ee063bd0a 100644 --- a/.github/workflows/ci-shell-installer.yml +++ b/.github/workflows/ci-shell-installer.yml @@ -16,6 +16,8 @@ name: CI shell installer 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 7158a1ea62..a3af753166 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,6 +12,8 @@ on: branches: ["main", "release/**"] pull_request: branches: ["main", "release/**"] + merge_group: + branches: ["main", "release/**"] workflow_dispatch: env: 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