44 push :
55 branches : ["develop", "release-*"]
66 pull_request :
7+ merge_group :
78 workflow_dispatch :
89
910concurrency :
@@ -112,7 +113,7 @@ jobs:
112113 # There don't seem to be versioned releases of this action per se: for each rust
113114 # version there is a branch which gets constantly rebased on top of master.
114115 # We pin to a specific commit for paranoia's sake.
115- uses : dtolnay/rust-toolchain@9cd00a88a73addc8617065438eff914dd08d0955
116+ uses : dtolnay/rust-toolchain@e12eda571dc9a5ee5d58eecf4738ec291c66f295
116117 with :
117118 toolchain : 1.58.1
118119 components : clippy
@@ -134,7 +135,7 @@ jobs:
134135 # There don't seem to be versioned releases of this action per se: for each rust
135136 # version there is a branch which gets constantly rebased on top of master.
136137 # We pin to a specific commit for paranoia's sake.
137- uses : dtolnay/rust-toolchain@9cd00a88a73addc8617065438eff914dd08d0955
138+ uses : dtolnay/rust-toolchain@e12eda571dc9a5ee5d58eecf4738ec291c66f295
138139 with :
139140 toolchain : nightly-2022-12-01
140141 components : clippy
@@ -154,9 +155,10 @@ jobs:
154155 # There don't seem to be versioned releases of this action per se: for each rust
155156 # version there is a branch which gets constantly rebased on top of master.
156157 # We pin to a specific commit for paranoia's sake.
157- uses : dtolnay/rust-toolchain@9cd00a88a73addc8617065438eff914dd08d0955
158+ uses : dtolnay/rust-toolchain@e12eda571dc9a5ee5d58eecf4738ec291c66f295
158159 with :
159- toolchain : 1.58.1
160+ # We use nightly so that it correctly groups together imports
161+ toolchain : nightly-2022-12-01
160162 components : rustfmt
161163 - uses : Swatinem/rust-cache@v2
162164
@@ -221,7 +223,7 @@ jobs:
221223 # There don't seem to be versioned releases of this action per se: for each rust
222224 # version there is a branch which gets constantly rebased on top of master.
223225 # We pin to a specific commit for paranoia's sake.
224- uses : dtolnay/rust-toolchain@9cd00a88a73addc8617065438eff914dd08d0955
226+ uses : dtolnay/rust-toolchain@e12eda571dc9a5ee5d58eecf4738ec291c66f295
225227 with :
226228 toolchain : 1.58.1
227229 - uses : Swatinem/rust-cache@v2
@@ -266,7 +268,7 @@ jobs:
266268 # There don't seem to be versioned releases of this action per se: for each rust
267269 # version there is a branch which gets constantly rebased on top of master.
268270 # We pin to a specific commit for paranoia's sake.
269- uses : dtolnay/rust-toolchain@9cd00a88a73addc8617065438eff914dd08d0955
271+ uses : dtolnay/rust-toolchain@e12eda571dc9a5ee5d58eecf4738ec291c66f295
270272 with :
271273 toolchain : 1.58.1
272274 - uses : Swatinem/rust-cache@v2
@@ -368,6 +370,7 @@ jobs:
368370 SYTEST_BRANCH : ${{ github.head_ref }}
369371 POSTGRES : ${{ matrix.job.postgres && 1}}
370372 MULTI_POSTGRES : ${{ (matrix.job.postgres == 'multi-postgres') && 1}}
373+ ASYNCIO_REACTOR : ${{ (matrix.job.reactor == 'asyncio') && 1 }}
371374 WORKERS : ${{ matrix.job.workers && 1 }}
372375 BLACKLIST : ${{ matrix.job.workers && 'synapse-blacklist-with-workers' }}
373376 TOP : ${{ github.workspace }}
@@ -386,7 +389,7 @@ jobs:
386389 # There don't seem to be versioned releases of this action per se: for each rust
387390 # version there is a branch which gets constantly rebased on top of master.
388391 # We pin to a specific commit for paranoia's sake.
389- uses : dtolnay/rust-toolchain@9cd00a88a73addc8617065438eff914dd08d0955
392+ uses : dtolnay/rust-toolchain@e12eda571dc9a5ee5d58eecf4738ec291c66f295
390393 with :
391394 toolchain : 1.58.1
392395 - uses : Swatinem/rust-cache@v2
@@ -531,7 +534,7 @@ jobs:
531534 # There don't seem to be versioned releases of this action per se: for each rust
532535 # version there is a branch which gets constantly rebased on top of master.
533536 # We pin to a specific commit for paranoia's sake.
534- uses : dtolnay/rust-toolchain@9cd00a88a73addc8617065438eff914dd08d0955
537+ uses : dtolnay/rust-toolchain@e12eda571dc9a5ee5d58eecf4738ec291c66f295
535538 with :
536539 toolchain : 1.58.1
537540 - uses : Swatinem/rust-cache@v2
@@ -562,7 +565,7 @@ jobs:
562565 # There don't seem to be versioned releases of this action per se: for each rust
563566 # version there is a branch which gets constantly rebased on top of master.
564567 # We pin to a specific commit for paranoia's sake.
565- uses : dtolnay/rust-toolchain@9cd00a88a73addc8617065438eff914dd08d0955
568+ uses : dtolnay/rust-toolchain@e12eda571dc9a5ee5d58eecf4738ec291c66f295
566569 with :
567570 toolchain : 1.58.1
568571 - uses : Swatinem/rust-cache@v2
@@ -585,7 +588,7 @@ jobs:
585588 # There don't seem to be versioned releases of this action per se: for each rust
586589 # version there is a branch which gets constantly rebased on top of master.
587590 # We pin to a specific commit for paranoia's sake.
588- uses : dtolnay/rust-toolchain@9cd00a88a73addc8617065438eff914dd08d0955
591+ uses : dtolnay/rust-toolchain@e12eda571dc9a5ee5d58eecf4738ec291c66f295
589592 with :
590593 toolchain : nightly-2022-12-01
591594 - uses : Swatinem/rust-cache@v2
0 commit comments