Skip to content

Commit d1f6250

Browse files
authored
Merge branch 'RustPython:main' into main
2 parents 94d2752 + a09afab commit d1f6250

File tree

22 files changed

+1354
-275
lines changed

22 files changed

+1354
-275
lines changed

.github/workflows/ci.yaml

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,9 @@ jobs:
5050
with:
5151
persist-credentials: false
5252

53-
- uses: dtolnay/rust-toolchain@3c5f7ea28cd621ae0bf5283f0e981fb97b8a7af9
53+
- uses: dtolnay/rust-toolchain@stable
5454
with:
5555
components: clippy
56-
toolchain: stable
5756

5857
- uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1
5958
with:
@@ -170,7 +169,9 @@ jobs:
170169
restore-keys: |
171170
cargo-check-${{ runner.os }}-${{ matrix.target }}-
172171
173-
- run: rustup toolchain install stable --target "${{ matrix.target }}"
172+
- uses: dtolnay/rust-toolchain@stable
173+
with:
174+
target: ${{ matrix.target }}
174175

175176
- name: Setup Android NDK
176177
if: ${{ matrix.target == 'aarch64-linux-android' }}
@@ -251,9 +252,7 @@ jobs:
251252
with:
252253
persist-credentials: false
253254

254-
- uses: dtolnay/rust-toolchain@3c5f7ea28cd621ae0bf5283f0e981fb97b8a7af9
255-
with:
256-
toolchain: stable
255+
- uses: dtolnay/rust-toolchain@stable
257256

258257
- uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1
259258
with:
@@ -366,9 +365,8 @@ jobs:
366365
with:
367366
python-version: ${{ env.PYTHON_VERSION }}
368367

369-
- uses: dtolnay/rust-toolchain@3c5f7ea28cd621ae0bf5283f0e981fb97b8a7af9
368+
- uses: dtolnay/rust-toolchain@stable
370369
with:
371-
toolchain: stable
372370
components: rustfmt
373371

374372
- uses: cargo-bins/cargo-binstall@113a77a4ce971c41332f2129c3d995df993cf746 # v1.17.8
@@ -425,7 +423,7 @@ jobs:
425423
with:
426424
persist-credentials: false
427425

428-
- uses: dtolnay/rust-toolchain@3c5f7ea28cd621ae0bf5283f0e981fb97b8a7af9
426+
- uses: dtolnay/rust-toolchain@master
429427
with:
430428
toolchain: ${{ env.NIGHTLY_CHANNEL }}
431429
components: miri
@@ -451,10 +449,9 @@ jobs:
451449
with:
452450
persist-credentials: false
453451

454-
- uses: dtolnay/rust-toolchain@3c5f7ea28cd621ae0bf5283f0e981fb97b8a7af9
452+
- uses: dtolnay/rust-toolchain@stable
455453
with:
456454
components: clippy
457-
toolchain: stable
458455

459456
- uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1
460457
with:
@@ -529,10 +526,9 @@ jobs:
529526
with:
530527
persist-credentials: false
531528

532-
- uses: dtolnay/rust-toolchain@3c5f7ea28cd621ae0bf5283f0e981fb97b8a7af9
529+
- uses: dtolnay/rust-toolchain@stable
533530
with:
534531
target: wasm32-wasip1
535-
toolchain: stable
536532

537533
- uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1
538534
with:

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
with:
5353
persist-credentials: false
5454

55-
- uses: dtolnay/rust-toolchain@3c5f7ea28cd621ae0bf5283f0e981fb97b8a7af9
55+
- uses: dtolnay/rust-toolchain@stable
5656
with:
5757
target: ${{ matrix.target }}
5858

@@ -89,7 +89,7 @@ jobs:
8989
with:
9090
persist-credentials: false
9191

92-
- uses: dtolnay/rust-toolchain@3c5f7ea28cd621ae0bf5283f0e981fb97b8a7af9
92+
- uses: dtolnay/rust-toolchain@stable
9393
with:
9494
targets: wasm32-wasip1
9595

.github/zizmor.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
rules:
2+
unpinned-uses:
3+
config:
4+
policies:
5+
# dtolnay/rust-toolchain is a trusted action that uses lightweight branch
6+
# refs (@stable, @nightly, etc.) by design. Pinning to a hash would break
7+
# the intended usage pattern.
8+
# We can remove this once https://github.com/dtolnay/rust-toolchain/issues/180 is resolved
9+
dtolnay/rust-toolchain: any
10+
# dtolnay/rust-toolchain handles component installation, target addition, and
11+
# override configuration beyond what a bare `rustup` invocation provides.
12+
# See: https://github.com/zizmorcore/zizmor/issues/1817
13+
superfluous-actions:
14+
disable: true

0 commit comments

Comments
 (0)