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
2 changes: 2 additions & 0 deletions .github/workflows/ci-linux-kvm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ on:
branches: ["main", "release/**"]
pull_request:
branches: ["main", "release/**"]
merge_group:
branches: ["main", "release/**"]
workflow_dispatch:

env:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/ci-linux-native.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ on:
branches: ["main", "release/**"]
pull_request:
branches: ["main", "release/**"]
merge_group:
branches: ["main", "release/**"]
workflow_dispatch:

env:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/ci-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/ci-shell-installer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ on:
branches: ["main", "release/**"]
pull_request:
branches: ["main", "release/**"]
merge_group:
Comment thread
norrietaylor marked this conversation as resolved.
Resolved
branches: ["main", "release/**"]
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
workflow_dispatch:

env:
Expand Down
1 change: 1 addition & 0 deletions crates/minimald/src/session/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
},
Expand Down
1 change: 1 addition & 0 deletions crates/minimald/src/session_host/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading