Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit a62c796

Browse files
author
David Robertson
authored
Deal with another batch of GHA warning messages (#14313)
1 parent efdcb24 commit a62c796

File tree

2 files changed

+39
-16
lines changed

2 files changed

+39
-16
lines changed

.github/workflows/tests.yml

Lines changed: 38 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ jobs:
3333
steps:
3434
- uses: actions/checkout@v3
3535
- uses: actions/setup-python@v4
36+
with:
37+
python-version: "3.x"
3638
- uses: matrix-org/setup-python-poetry@v1
3739
with:
3840
extras: "all"
@@ -44,6 +46,8 @@ jobs:
4446
steps:
4547
- uses: actions/checkout@v3
4648
- uses: actions/setup-python@v4
49+
with:
50+
python-version: "3.x"
4751
- run: "pip install 'click==8.1.1' 'GitPython>=3.1.20'"
4852
- run: scripts-dev/check_schema_delta.py --force-colors
4953

@@ -68,6 +72,8 @@ jobs:
6872
ref: ${{ github.event.pull_request.head.sha }}
6973
fetch-depth: 0
7074
- uses: actions/setup-python@v4
75+
with:
76+
python-version: "3.x"
7177
- run: "pip install 'towncrier>=18.6.0rc1'"
7278
- run: scripts-dev/check-newsfragment.sh
7379
env:
@@ -93,10 +99,12 @@ jobs:
9399
- uses: actions/checkout@v3
94100

95101
- name: Install Rust
96-
uses: actions-rs/toolchain@v1
102+
# There don't seem to be versioned releases of this action per se: for each rust
103+
# version there is a branch which gets constantly rebased on top of master.
104+
# We pin to a specific commit for paranoia's sake.
105+
uses: dtolnay/rust-toolchain@55c7845fad90d0ae8b2e83715cb900e5e861e8cb
97106
with:
98107
toolchain: 1.58.1
99-
override: true
100108
components: clippy
101109
- uses: Swatinem/rust-cache@v2
102110

@@ -111,11 +119,13 @@ jobs:
111119
- uses: actions/checkout@v3
112120

113121
- name: Install Rust
114-
uses: actions-rs/toolchain@v1
122+
# There don't seem to be versioned releases of this action per se: for each rust
123+
# version there is a branch which gets constantly rebased on top of master.
124+
# We pin to a specific commit for paranoia's sake.
125+
uses: dtolnay/rust-toolchain@55c7845fad90d0ae8b2e83715cb900e5e861e8cb
115126
with:
116-
toolchain: 1.58.1
117-
override: true
118-
components: rustfmt
127+
toolchain: 1.58.1
128+
components: rustfmt
119129
- uses: Swatinem/rust-cache@v2
120130

121131
- run: cargo fmt --check
@@ -143,6 +153,8 @@ jobs:
143153
steps:
144154
- uses: actions/checkout@v3
145155
- uses: actions/setup-python@v4
156+
with:
157+
python-version: "3.x"
146158
- id: get-matrix
147159
run: .ci/scripts/calculate_jobs.py
148160
outputs:
@@ -169,10 +181,12 @@ jobs:
169181
postgres:${{ matrix.job.postgres-version }}
170182
171183
- name: Install Rust
172-
uses: actions-rs/toolchain@v1
184+
# There don't seem to be versioned releases of this action per se: for each rust
185+
# version there is a branch which gets constantly rebased on top of master.
186+
# We pin to a specific commit for paranoia's sake.
187+
uses: dtolnay/rust-toolchain@55c7845fad90d0ae8b2e83715cb900e5e861e8cb
173188
with:
174189
toolchain: 1.58.1
175-
override: true
176190
- uses: Swatinem/rust-cache@v2
177191

178192
- uses: matrix-org/setup-python-poetry@v1
@@ -211,10 +225,12 @@ jobs:
211225
- uses: actions/checkout@v3
212226

213227
- name: Install Rust
214-
uses: actions-rs/toolchain@v1
228+
# There don't seem to be versioned releases of this action per se: for each rust
229+
# version there is a branch which gets constantly rebased on top of master.
230+
# We pin to a specific commit for paranoia's sake.
231+
uses: dtolnay/rust-toolchain@55c7845fad90d0ae8b2e83715cb900e5e861e8cb
215232
with:
216233
toolchain: 1.58.1
217-
override: true
218234
- uses: Swatinem/rust-cache@v2
219235

220236
# There aren't wheels for some of the older deps, so we need to install
@@ -327,10 +343,12 @@ jobs:
327343
run: cat sytest-blacklist .ci/worker-blacklist > synapse-blacklist-with-workers
328344

329345
- name: Install Rust
330-
uses: actions-rs/toolchain@v1
346+
# There don't seem to be versioned releases of this action per se: for each rust
347+
# version there is a branch which gets constantly rebased on top of master.
348+
# We pin to a specific commit for paranoia's sake.
349+
uses: dtolnay/rust-toolchain@55c7845fad90d0ae8b2e83715cb900e5e861e8cb
331350
with:
332351
toolchain: 1.58.1
333-
override: true
334352
- uses: Swatinem/rust-cache@v2
335353

336354
- name: Run SyTest
@@ -459,10 +477,12 @@ jobs:
459477
path: synapse
460478

461479
- name: Install Rust
462-
uses: actions-rs/toolchain@v1
480+
# There don't seem to be versioned releases of this action per se: for each rust
481+
# version there is a branch which gets constantly rebased on top of master.
482+
# We pin to a specific commit for paranoia's sake.
483+
uses: dtolnay/rust-toolchain@55c7845fad90d0ae8b2e83715cb900e5e861e8cb
463484
with:
464485
toolchain: 1.58.1
465-
override: true
466486
- uses: Swatinem/rust-cache@v2
467487

468488
- name: Prepare Complement's Prerequisites
@@ -485,10 +505,12 @@ jobs:
485505
- uses: actions/checkout@v3
486506

487507
- name: Install Rust
488-
uses: actions-rs/toolchain@v1
508+
# There don't seem to be versioned releases of this action per se: for each rust
509+
# version there is a branch which gets constantly rebased on top of master.
510+
# We pin to a specific commit for paranoia's sake.
511+
uses: dtolnay/rust-toolchain@55c7845fad90d0ae8b2e83715cb900e5e861e8cb
489512
with:
490513
toolchain: 1.58.1
491-
override: true
492514
- uses: Swatinem/rust-cache@v2
493515

494516
- run: cargo test

changelog.d/14313.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Switch to a maintained action for installing Rust in CI.

0 commit comments

Comments
 (0)