4
4
push :
5
5
branches : ["develop", "release-*"]
6
6
pull_request :
7
+ merge_group :
7
8
workflow_dispatch :
8
9
9
10
concurrency :
@@ -112,7 +113,7 @@ jobs:
112
113
# There don't seem to be versioned releases of this action per se: for each rust
113
114
# version there is a branch which gets constantly rebased on top of master.
114
115
# We pin to a specific commit for paranoia's sake.
115
- uses : dtolnay/rust-toolchain@9cd00a88a73addc8617065438eff914dd08d0955
116
+ uses : dtolnay/rust-toolchain@e12eda571dc9a5ee5d58eecf4738ec291c66f295
116
117
with :
117
118
toolchain : 1.58.1
118
119
components : clippy
@@ -134,7 +135,7 @@ jobs:
134
135
# There don't seem to be versioned releases of this action per se: for each rust
135
136
# version there is a branch which gets constantly rebased on top of master.
136
137
# We pin to a specific commit for paranoia's sake.
137
- uses : dtolnay/rust-toolchain@9cd00a88a73addc8617065438eff914dd08d0955
138
+ uses : dtolnay/rust-toolchain@e12eda571dc9a5ee5d58eecf4738ec291c66f295
138
139
with :
139
140
toolchain : nightly-2022-12-01
140
141
components : clippy
@@ -154,9 +155,10 @@ jobs:
154
155
# There don't seem to be versioned releases of this action per se: for each rust
155
156
# version there is a branch which gets constantly rebased on top of master.
156
157
# We pin to a specific commit for paranoia's sake.
157
- uses : dtolnay/rust-toolchain@9cd00a88a73addc8617065438eff914dd08d0955
158
+ uses : dtolnay/rust-toolchain@e12eda571dc9a5ee5d58eecf4738ec291c66f295
158
159
with :
159
- toolchain : 1.58.1
160
+ # We use nightly so that it correctly groups together imports
161
+ toolchain : nightly-2022-12-01
160
162
components : rustfmt
161
163
- uses : Swatinem/rust-cache@v2
162
164
@@ -221,7 +223,7 @@ jobs:
221
223
# There don't seem to be versioned releases of this action per se: for each rust
222
224
# version there is a branch which gets constantly rebased on top of master.
223
225
# We pin to a specific commit for paranoia's sake.
224
- uses : dtolnay/rust-toolchain@9cd00a88a73addc8617065438eff914dd08d0955
226
+ uses : dtolnay/rust-toolchain@e12eda571dc9a5ee5d58eecf4738ec291c66f295
225
227
with :
226
228
toolchain : 1.58.1
227
229
- uses : Swatinem/rust-cache@v2
@@ -266,7 +268,7 @@ jobs:
266
268
# There don't seem to be versioned releases of this action per se: for each rust
267
269
# version there is a branch which gets constantly rebased on top of master.
268
270
# We pin to a specific commit for paranoia's sake.
269
- uses : dtolnay/rust-toolchain@9cd00a88a73addc8617065438eff914dd08d0955
271
+ uses : dtolnay/rust-toolchain@e12eda571dc9a5ee5d58eecf4738ec291c66f295
270
272
with :
271
273
toolchain : 1.58.1
272
274
- uses : Swatinem/rust-cache@v2
@@ -368,6 +370,7 @@ jobs:
368
370
SYTEST_BRANCH : ${{ github.head_ref }}
369
371
POSTGRES : ${{ matrix.job.postgres && 1}}
370
372
MULTI_POSTGRES : ${{ (matrix.job.postgres == 'multi-postgres') && 1}}
373
+ ASYNCIO_REACTOR : ${{ (matrix.job.reactor == 'asyncio') && 1 }}
371
374
WORKERS : ${{ matrix.job.workers && 1 }}
372
375
BLACKLIST : ${{ matrix.job.workers && 'synapse-blacklist-with-workers' }}
373
376
TOP : ${{ github.workspace }}
@@ -386,7 +389,7 @@ jobs:
386
389
# There don't seem to be versioned releases of this action per se: for each rust
387
390
# version there is a branch which gets constantly rebased on top of master.
388
391
# We pin to a specific commit for paranoia's sake.
389
- uses : dtolnay/rust-toolchain@9cd00a88a73addc8617065438eff914dd08d0955
392
+ uses : dtolnay/rust-toolchain@e12eda571dc9a5ee5d58eecf4738ec291c66f295
390
393
with :
391
394
toolchain : 1.58.1
392
395
- uses : Swatinem/rust-cache@v2
@@ -531,7 +534,7 @@ jobs:
531
534
# There don't seem to be versioned releases of this action per se: for each rust
532
535
# version there is a branch which gets constantly rebased on top of master.
533
536
# We pin to a specific commit for paranoia's sake.
534
- uses : dtolnay/rust-toolchain@9cd00a88a73addc8617065438eff914dd08d0955
537
+ uses : dtolnay/rust-toolchain@e12eda571dc9a5ee5d58eecf4738ec291c66f295
535
538
with :
536
539
toolchain : 1.58.1
537
540
- uses : Swatinem/rust-cache@v2
@@ -562,7 +565,7 @@ jobs:
562
565
# There don't seem to be versioned releases of this action per se: for each rust
563
566
# version there is a branch which gets constantly rebased on top of master.
564
567
# We pin to a specific commit for paranoia's sake.
565
- uses : dtolnay/rust-toolchain@9cd00a88a73addc8617065438eff914dd08d0955
568
+ uses : dtolnay/rust-toolchain@e12eda571dc9a5ee5d58eecf4738ec291c66f295
566
569
with :
567
570
toolchain : 1.58.1
568
571
- uses : Swatinem/rust-cache@v2
@@ -585,7 +588,7 @@ jobs:
585
588
# There don't seem to be versioned releases of this action per se: for each rust
586
589
# version there is a branch which gets constantly rebased on top of master.
587
590
# We pin to a specific commit for paranoia's sake.
588
- uses : dtolnay/rust-toolchain@9cd00a88a73addc8617065438eff914dd08d0955
591
+ uses : dtolnay/rust-toolchain@e12eda571dc9a5ee5d58eecf4738ec291c66f295
589
592
with :
590
593
toolchain : nightly-2022-12-01
591
594
- uses : Swatinem/rust-cache@v2
0 commit comments