Skip to content

Commit 1c4d4e9

Browse files
alexalex
authored
Remove usage of actions-rs actions (#7422)
They appear to be unmaintained at this point: actions-rs/toolchain#216 Also for most of these we can simply use the Rust that comes with the GHA image
1 parent dc289d2 commit 1c4d4e9

File tree

2 files changed

+7
-62
lines changed

2 files changed

+7
-62
lines changed

‎.github/workflows/ci.yml

Lines changed: 5 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ jobs:
4747
- {VERSION: "3.10", TOXENV: "py310-randomorder"}
4848
# Latest commit on the master branch, as of Jul 15, 2022.
4949
- {VERSION: "3.10", TOXENV: "py310", OPENSSL: {TYPE: "boringssl", VERSION: "b6f47e88b09703e925c894ca77a5d90ee413e6b5"}}
50-
RUST:
51-
- stable
5250
name: "${{ matrix.PYTHON.TOXENV }} ${{ matrix.PYTHON.OPENSSL.TYPE }} ${{ matrix.PYTHON.OPENSSL.VERSION }} ${{ matrix.PYTHON.TOXARGS }} ${{ matrix.PYTHON.OPENSSL.CONFIG_FLAGS }}"
5351
timeout-minutes: 15
5452
steps:
@@ -74,12 +72,6 @@ jobs:
7472
src/rust/target/
7573
key: ${{ runner.os }}-${{ matrix.PYTHON.VERSION }}-${{ steps.setup-python.outputs.python-version }}-cargo-3-${{ hashFiles('**/Cargo.lock') }}
7674

77-
- uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af
78-
with:
79-
profile: minimal
80-
toolchain: ${{ matrix.RUST }}
81-
override: true
82-
default: true
8375
- uses: actions/[email protected]
8476
timeout-minutes: 3
8577
with:
@@ -225,12 +217,9 @@ jobs:
225217
uses: actions/[email protected]
226218
with:
227219
python-version: ${{ matrix.PYTHON.VERSION }}
228-
- uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af
220+
- uses: dtolnay/rust-toolchain@3d5c338b548e8aff8b55d96390e28fa86945e1b2
229221
with:
230-
profile: minimal
231222
toolchain: ${{ matrix.RUST }}
232-
override: true
233-
default: true
234223
- uses: actions/[email protected]
235224
timeout-minutes: 3
236225
with:
@@ -280,17 +269,11 @@ jobs:
280269
uses: actions/[email protected]
281270
with:
282271
python-version: ${{ matrix.PYTHON.VERSION }}
283-
- uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af
272+
- uses: dtolnay/rust-toolchain@3d5c338b548e8aff8b55d96390e28fa86945e1b2
284273
with:
285-
profile: minimal
286274
toolchain: ${{ matrix.RUST }}
287-
override: true
288-
default: true
289275
components: llvm-tools-preview
290-
- uses: actions-rs/install@9da1d2adcfe5e7c16992e8242ca33a56b6d9b101
291-
with:
292-
crate: cargo-binutils
293-
version: latest
276+
- run: cargo install cargo-binutils
294277
if: steps.cargo-cache.outputs.cache-hit != 'true'
295278

296279
- uses: actions/[email protected]
@@ -347,8 +330,6 @@ jobs:
347330
PYTHON:
348331
- {VERSION: "3.6", TOXENV: "py36", EXTRA_CFLAGS: ""}
349332
- {VERSION: "3.10.3", TOXENV: "py310", EXTRA_CFLAGS: "-DUSE_OSRANDOM_RNG_FOR_TESTING"}
350-
RUST:
351-
- stable
352333
name: "${{ matrix.PYTHON.TOXENV }} on macOS"
353334
timeout-minutes: 15
354335
steps:
@@ -373,12 +354,6 @@ jobs:
373354
uses: actions/[email protected]
374355
with:
375356
python-version: ${{ matrix.PYTHON.VERSION }}
376-
- uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af
377-
with:
378-
profile: minimal
379-
toolchain: ${{ matrix.RUST }}
380-
override: true
381-
default: true
382357

383358
- run: python -m pip install tox requests coverage[toml]
384359

@@ -413,13 +388,11 @@ jobs:
413388
fail-fast: false
414389
matrix:
415390
WINDOWS:
416-
- {ARCH: 'x86', WINDOWS: 'win32', RUST_TRIPLE: 'i686-pc-windows-msvc'}
417-
- {ARCH: 'x64', WINDOWS: 'win64', RUST_TRIPLE: 'x86_64-pc-windows-msvc'}
391+
- {ARCH: 'x86', WINDOWS: 'win32'}
392+
- {ARCH: 'x64', WINDOWS: 'win64'}
418393
PYTHON:
419394
- {VERSION: "3.6", TOXENV: "py36-nocoverage", CL_FLAGS: ""}
420395
- {VERSION: "3.10", TOXENV: "py310", CL_FLAGS: "/D USE_OSRANDOM_RNG_FOR_TESTING"}
421-
RUST:
422-
- stable
423396
JOB_NUMBER: [0, 1, 2]
424397
name: "${{ matrix.PYTHON.TOXENV }} on ${{ matrix.WINDOWS.WINDOWS }} (part ${{ matrix.JOB_NUMBER }})"
425398
timeout-minutes: 15
@@ -447,14 +420,6 @@ jobs:
447420
src/rust/target/
448421
key: ${{ runner.os }}-${{ matrix.WINDOWS.ARCH }}-${{ steps.setup-python.outputs.python-version }}-cargo-3-${{ hashFiles('**/Cargo.lock') }}
449422

450-
- uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af
451-
with:
452-
profile: minimal
453-
toolchain: ${{ matrix.RUST }}
454-
override: true
455-
default: true
456-
target: ${{ matrix.WINDOWS.RUST_TRIPLE }}
457-
458423
- run: python -m pip install tox requests coverage[toml]
459424
- name: Download OpenSSL
460425
run: |
@@ -494,8 +459,6 @@ jobs:
494459
- certbot
495460
- certbot-josepy
496461
- mitmproxy
497-
RUST:
498-
- stable
499462
PYTHON:
500463
- 3.9
501464
name: "Downstream tests for ${{ matrix.DOWNSTREAM }}"
@@ -522,12 +485,6 @@ jobs:
522485
uses: actions/[email protected]
523486
with:
524487
python-version: ${{ matrix.PYTHON }}
525-
- uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af
526-
with:
527-
profile: minimal
528-
toolchain: ${{ matrix.RUST }}
529-
override: true
530-
default: true
531488
- run: ./.github/downstream.d/${{ matrix.DOWNSTREAM }}.sh install
532489
- run: pip install .
533490
env:
@@ -547,12 +504,6 @@ jobs:
547504
uses: actions/[email protected]
548505
with:
549506
python-version: 3.9
550-
- uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af
551-
with:
552-
profile: minimal
553-
toolchain: stable
554-
override: true
555-
default: true
556507
- run: python -m pip install -U tox
557508
- run: tox -r -- --color=yes
558509
env:

‎.github/workflows/wheel-builder.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -146,12 +146,9 @@ jobs:
146146
${{ matrix.PYTHON.BIN_PATH }} .github/workflows/download_openssl.py macos openssl-macos-universal2
147147
env:
148148
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
149-
- uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af
149+
- uses: dtolnay/rust-toolchain@3d5c338b548e8aff8b55d96390e28fa86945e1b2
150150
with:
151-
profile: minimal
152151
toolchain: stable
153-
override: true
154-
default: true
155152
# Add the arm64 target in addition to the native arch (x86_64)
156153
target: aarch64-apple-darwin
157154

@@ -216,12 +213,9 @@ jobs:
216213
with:
217214
python-version: ${{ matrix.PYTHON.VERSION }}
218215
architecture: ${{ matrix.WINDOWS.ARCH }}
219-
- uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af
216+
- uses: dtolnay/rust-toolchain@3d5c338b548e8aff8b55d96390e28fa86945e1b2
220217
with:
221-
profile: minimal
222218
toolchain: stable
223-
override: true
224-
default: true
225219
target: ${{ matrix.WINDOWS.RUST_TRIPLE }}
226220

227221
- run: pip install requests

0 commit comments

Comments
 (0)