Skip to content

Commit dbf821e

Browse files
authored
Merge pull request #300 from messense/rm-actions-rs
CI: switch from `actions-rs/toolchain` to `dtolnay/rust-toolchain`
2 parents b0592f1 + 4d4cc0d commit dbf821e

File tree

2 files changed

+24
-50
lines changed

2 files changed

+24
-50
lines changed

.github/workflows/ci.yml

Lines changed: 22 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: actions/checkout@v3
1717

1818
- name: Set up Python ${{ matrix.python-version }}
19-
uses: actions/setup-python@v2
19+
uses: actions/setup-python@v4
2020
with:
2121
python-version: "3.x"
2222

@@ -30,7 +30,7 @@ jobs:
3030
- uses: actions/checkout@v3
3131

3232
- name: Set up Python ${{ matrix.python-version }}
33-
uses: actions/setup-python@v2
33+
uses: actions/setup-python@v4
3434
with:
3535
python-version: "3.x"
3636

@@ -44,16 +44,12 @@ jobs:
4444
- uses: actions/checkout@v3
4545

4646
- name: Set up Python ${{ matrix.python-version }}
47-
uses: actions/setup-python@v2
47+
uses: actions/setup-python@v4
4848
with:
4949
python-version: "3.x"
5050

5151
- name: Install Rust toolchain
52-
uses: actions-rs/toolchain@v1
53-
with:
54-
toolchain: stable
55-
profile: minimal
56-
default: true
52+
uses: dtolnay/rust-toolchain@stable
5753

5854
- run: pip install nox
5955

@@ -85,18 +81,15 @@ jobs:
8581
- uses: actions/checkout@v3
8682

8783
- name: Set up Python ${{ matrix.python-version }}
88-
uses: actions/setup-python@v2
84+
uses: actions/setup-python@v4
8985
with:
9086
python-version: ${{ matrix.python-version }}
9187
architecture: ${{ matrix.platform.python-architecture }}
9288

9389
- name: Install Rust toolchain
94-
uses: actions-rs/toolchain@v1
90+
uses: dtolnay/rust-toolchain@stable
9591
with:
96-
toolchain: stable
97-
target: ${{ matrix.platform.rust-target }}
98-
profile: minimal
99-
default: true
92+
targets: ${{ matrix.platform.rust-target }}
10093

10194
- name: Install Rust aarch64-apple-darwin target
10295
if: matrix.platform.os == 'macos-latest'
@@ -148,15 +141,11 @@ jobs:
148141
steps:
149142
- uses: actions/checkout@master
150143
- name: Setup python
151-
uses: actions/setup-python@v2
144+
uses: actions/setup-python@v4
152145
with:
153146
python-version: 3.9
154147

155-
- uses: actions-rs/toolchain@v1
156-
with:
157-
profile: minimal
158-
toolchain: stable
159-
override: true
148+
- uses: dtolnay/rust-toolchain@stable
160149

161150
- name: Install Rust aarch64-apple-darwin target
162151
if: matrix.os == 'macos-latest'
@@ -180,7 +169,7 @@ jobs:
180169
# Now we switch to a differnet Python version and ensure we can install
181170
# the wheel we just built.
182171
- name: Setup python
183-
uses: actions/setup-python@v2
172+
uses: actions/setup-python@v4
184173
with:
185174
python-version: "3.10"
186175

@@ -251,14 +240,10 @@ jobs:
251240
steps:
252241
- uses: actions/checkout@v3
253242
- name: Setup python
254-
uses: actions/setup-python@v2
243+
uses: actions/setup-python@v4
255244
with:
256245
python-version: 3.8
257-
- uses: actions-rs/toolchain@v1
258-
with:
259-
profile: minimal
260-
toolchain: stable
261-
override: true
246+
- uses: dtolnay/rust-toolchain@stable
262247
- name: Install cross
263248
uses: taiki-e/install-action@v1
264249
with:
@@ -298,15 +283,12 @@ jobs:
298283
steps:
299284
- uses: actions/checkout@v3
300285
- name: Setup python
301-
uses: actions/setup-python@v2
286+
uses: actions/setup-python@v4
302287
with:
303288
python-version: 3.8
304-
- uses: actions-rs/toolchain@v1
289+
- uses: dtolnay/rust-toolchain@stable
305290
with:
306-
profile: minimal
307-
toolchain: stable
308-
target: aarch64-unknown-linux-gnu
309-
override: true
291+
targets: aarch64-unknown-linux-gnu
310292
- name: Install cargo-zigbuild
311293
run: |
312294
python3 -m pip install cargo-zigbuild
@@ -345,12 +327,9 @@ jobs:
345327
runs-on: macos-latest
346328
steps:
347329
- uses: actions/checkout@v3
348-
- uses: actions-rs/toolchain@v1
330+
- uses: dtolnay/rust-toolchain@stable
349331
with:
350-
profile: minimal
351-
toolchain: stable
352-
target: aarch64-apple-darwin
353-
override: true
332+
targets: aarch64-apple-darwin
354333
- uses: pypa/[email protected]
355334
env:
356335
CIBW_BUILD: cp39-*
@@ -384,11 +363,9 @@ jobs:
384363
mingw-w64-${{ matrix.arch }}-openssl
385364
mingw-w64-${{ matrix.arch }}-toolchain
386365
387-
- uses: actions-rs/toolchain@v1
366+
- uses: dtolnay/rust-toolchain@master
388367
with:
389-
profile: minimal
390368
toolchain: stable-${{ matrix.rust_target }}
391-
default: true
392369

393370
- name: Install test dependencies
394371
shell: msys2 {0}
@@ -425,18 +402,15 @@ jobs:
425402
echo "EMSCRIPTEN_VERSION=$EMSCRIPTEN_VERSION" >> $GITHUB_ENV
426403
echo "PYTHON_VERSION=$PYTHON_VERSION" >> $GITHUB_ENV
427404
echo "ORIG_PATH=$PATH" >> $GITHUB_ENV
428-
- uses: actions-rs/toolchain@v1
405+
- uses: dtolnay/rust-toolchain@nightly
429406
with:
430-
profile: minimal
431-
toolchain: nightly
432407
components: rust-src
433-
target: wasm32-unknown-emscripten
434-
override: true
408+
targets: wasm32-unknown-emscripten
435409
- uses: mymindstorm/setup-emsdk@v11
436410
with:
437411
version: ${{env.EMSCRIPTEN_VERSION}}
438412
actions-cache-folder: emsdk-cache
439-
- uses: actions/setup-python@v2
413+
- uses: actions/setup-python@v4
440414
id: setup-python
441415
with:
442416
python-version: ${{env.PYTHON_VERSION}}
@@ -446,7 +420,7 @@ jobs:
446420
path: |
447421
tests/pyodide
448422
key: ${{ hashFiles('tests/*.js') }} - ${{ hashFiles('noxfile.py') }} - ${{ steps.setup-python.outputs.python-path }}
449-
- uses: Swatinem/rust-cache@v1
423+
- uses: Swatinem/rust-cache@v2
450424
- name: Test
451425
run: |
452426
export PATH=$ORIG_PATH:$PATH

.github/workflows/python-publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ jobs:
1414
runs-on: ubuntu-latest
1515

1616
steps:
17-
- uses: actions/checkout@v2
17+
- uses: actions/checkout@v3
1818
with:
1919
# Fetch all history so that setuptools_scm works correctly
2020
fetch-depth: 0
2121
- name: Set up Python
22-
uses: actions/setup-python@v2
22+
uses: actions/setup-python@v4
2323
with:
2424
python-version: '3.x'
2525
- name: Install dependencies

0 commit comments

Comments
 (0)