Skip to content

Commit 8f5161f

Browse files
committed
Merge remote-tracking branch 'upstream/main' into CLN-ci-matrix
2 parents b667837 + f27490c commit 8f5161f

File tree

17 files changed

+317
-210
lines changed

17 files changed

+317
-210
lines changed

.github/workflows/ci.yaml

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@ jobs:
4141
os: [macos-latest, ubuntu-latest, windows-2025]
4242
fail-fast: false
4343
steps:
44-
- uses: actions/checkout@v6
44+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
45+
with:
46+
persist-credentials: false
47+
4548
- uses: dtolnay/rust-toolchain@stable
4649
with:
4750
components: clippy
@@ -275,7 +278,9 @@ jobs:
275278
timeout: 50
276279
fail-fast: false
277280
steps:
278-
- uses: actions/checkout@v6
281+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
282+
with:
283+
persist-credentials: false
279284

280285
- uses: dtolnay/rust-toolchain@stable
281286

@@ -365,7 +370,10 @@ jobs:
365370
name: Lint Rust & Python code
366371
runs-on: ubuntu-latest
367372
steps:
368-
- uses: actions/checkout@v6
373+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
374+
with:
375+
persist-credentials: false
376+
369377
- uses: actions/setup-python@v6.2.0
370378
with:
371379
python-version: ${{ env.PYTHON_VERSION }}
@@ -423,7 +431,9 @@ jobs:
423431
env:
424432
NIGHTLY_CHANNEL: nightly
425433
steps:
426-
- uses: actions/checkout@v6
434+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
435+
with:
436+
persist-credentials: false
427437

428438
- uses: dtolnay/rust-toolchain@master
429439
with:
@@ -445,7 +455,10 @@ jobs:
445455
runs-on: ubuntu-latest
446456
timeout-minutes: 30
447457
steps:
448-
- uses: actions/checkout@v6
458+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
459+
with:
460+
persist-credentials: false
461+
449462
- uses: dtolnay/rust-toolchain@stable
450463

451464
- uses: Swatinem/rust-cache@v2
@@ -508,7 +521,10 @@ jobs:
508521
runs-on: ubuntu-latest
509522
timeout-minutes: 30
510523
steps:
511-
- uses: actions/checkout@v6
524+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
525+
with:
526+
persist-credentials: false
527+
512528
- uses: dtolnay/rust-toolchain@stable
513529
with:
514530
target: wasm32-wasip1

.github/workflows/cron-ci.yaml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@ jobs:
2424
# Disable this scheduled job when running on a fork.
2525
if: ${{ github.repository == 'RustPython/RustPython' || github.event_name != 'schedule' }}
2626
steps:
27-
- uses: actions/checkout@v6
27+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
28+
with:
29+
persist-credentials: false
30+
2831
- uses: dtolnay/rust-toolchain@stable
2932
- uses: taiki-e/install-action@cargo-llvm-cov
3033
- uses: actions/setup-python@v6.2.0
@@ -53,7 +56,10 @@ jobs:
5356
# Disable this scheduled job when running on a fork.
5457
if: ${{ github.repository == 'RustPython/RustPython' || github.event_name != 'schedule' }}
5558
steps:
56-
- uses: actions/checkout@v6
59+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
60+
with:
61+
persist-credentials: true
62+
5763
- uses: dtolnay/rust-toolchain@stable
5864
- name: build rustpython
5965
run: cargo build --release --verbose
@@ -85,7 +91,10 @@ jobs:
8591
# Disable this scheduled job when running on a fork.
8692
if: ${{ github.repository == 'RustPython/RustPython' || github.event_name != 'schedule' }}
8793
steps:
88-
- uses: actions/checkout@v6
94+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
95+
with:
96+
persist-credentials: true
97+
8998
- uses: dtolnay/rust-toolchain@stable
9099
- uses: actions/setup-python@v6.2.0
91100
with:
@@ -143,7 +152,10 @@ jobs:
143152
# Disable this scheduled job when running on a fork.
144153
if: ${{ github.repository == 'RustPython/RustPython' || github.event_name != 'schedule' }}
145154
steps:
146-
- uses: actions/checkout@v6
155+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
156+
with:
157+
persist-credentials: true
158+
147159
- uses: dtolnay/rust-toolchain@stable
148160
- uses: actions/setup-python@v6.2.0
149161
with:

.github/workflows/lib-deps-check.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,12 @@ jobs:
2121
timeout-minutes: 10
2222
steps:
2323
- name: Checkout base branch
24-
uses: actions/checkout@v6
24+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2525
with:
2626
# Use base branch for scripts (security: don't run PR code with elevated permissions)
2727
ref: ${{ github.event.pull_request.base.ref }}
2828
fetch-depth: 0
29+
persist-credentials: false
2930

3031
- name: Fetch PR head
3132
run: |

.github/workflows/pr-format.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@ jobs:
2121
runs-on: ubuntu-latest
2222
timeout-minutes: 60
2323
steps:
24-
- name: Checkout PR branch
25-
uses: actions/checkout@v6
24+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
25+
with:
26+
persist-credentials: false
2627

2728
- name: Setup Rust
2829
uses: dtolnay/rust-toolchain@stable

.github/workflows/release.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,10 @@ jobs:
5252
# target: aarch64-pc-windows-msvc
5353
fail-fast: false
5454
steps:
55-
- uses: actions/checkout@v6
55+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
56+
with:
57+
persist-credentials: false
58+
5659
- uses: dtolnay/rust-toolchain@stable
5760
- uses: cargo-bins/cargo-binstall@main
5861

@@ -88,7 +91,10 @@ jobs:
8891
# Disable this scheduled job when running on a fork.
8992
if: ${{ github.repository == 'RustPython/RustPython' || github.event_name != 'schedule' }}
9093
steps:
91-
- uses: actions/checkout@v6
94+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
95+
with:
96+
persist-credentials: false
97+
9298
- uses: dtolnay/rust-toolchain@stable
9399
with:
94100
targets: wasm32-wasip1
@@ -139,7 +145,9 @@ jobs:
139145
if: ${{ github.repository == 'RustPython/RustPython' || github.event_name != 'schedule' }}
140146
needs: [build, build-wasm]
141147
steps:
142-
- uses: actions/checkout@v6
148+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
149+
with:
150+
persist-credentials: false
143151

144152
- name: Download Binary Artifacts
145153
uses: actions/download-artifact@v8.0.0

.github/workflows/update-doc-db.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- windows-latest
3131
- macos-latest
3232
steps:
33-
- uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98 # v6.0.1
33+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3434
with:
3535
persist-credentials: false
3636
sparse-checkout: |
@@ -55,8 +55,9 @@ jobs:
5555
runs-on: ubuntu-latest
5656
needs: generate
5757
steps:
58-
- uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98 # v6.0.1
58+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
5959
with:
60+
persist-credentials: true
6061
ref: ${{ inputs.base-ref }}
6162
token: ${{ secrets.AUTO_COMMIT_PAT }}
6263

Cargo.lock

Lines changed: 17 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -133,28 +133,28 @@ members = [
133133
exclude = ["pymath"]
134134

135135
[workspace.package]
136-
version = "0.4.0"
136+
version = "0.5.0"
137137
authors = ["RustPython Team"]
138138
edition = "2024"
139139
rust-version = "1.93.0"
140140
repository = "https://github.com/RustPython/RustPython"
141141
license = "MIT"
142142

143143
[workspace.dependencies]
144-
rustpython-compiler-core = { path = "crates/compiler-core", version = "0.4.0" }
145-
rustpython-compiler = { path = "crates/compiler", version = "0.4.0" }
146-
rustpython-codegen = { path = "crates/codegen", version = "0.4.0" }
147-
rustpython-common = { path = "crates/common", version = "0.4.0" }
148-
rustpython-derive = { path = "crates/derive", version = "0.4.0" }
149-
rustpython-derive-impl = { path = "crates/derive-impl", version = "0.4.0" }
150-
rustpython-jit = { path = "crates/jit", version = "0.4.0" }
151-
rustpython-literal = { path = "crates/literal", version = "0.4.0" }
152-
rustpython-vm = { path = "crates/vm", default-features = false, version = "0.4.0" }
153-
rustpython-pylib = { path = "crates/pylib", version = "0.4.0" }
154-
rustpython-stdlib = { path = "crates/stdlib", default-features = false, version = "0.4.0" }
155-
rustpython-sre_engine = { path = "crates/sre_engine", version = "0.4.0" }
156-
rustpython-wtf8 = { path = "crates/wtf8", version = "0.4.0" }
157-
rustpython-doc = { path = "crates/doc", version = "0.4.0" }
144+
rustpython-compiler-core = { path = "crates/compiler-core", version = "0.5.0" }
145+
rustpython-compiler = { path = "crates/compiler", version = "0.5.0" }
146+
rustpython-codegen = { path = "crates/codegen", version = "0.5.0" }
147+
rustpython-common = { path = "crates/common", version = "0.5.0" }
148+
rustpython-derive = { path = "crates/derive", version = "0.5.0" }
149+
rustpython-derive-impl = { path = "crates/derive-impl", version = "0.5.0" }
150+
rustpython-jit = { path = "crates/jit", version = "0.5.0" }
151+
rustpython-literal = { path = "crates/literal", version = "0.5.0" }
152+
rustpython-vm = { path = "crates/vm", default-features = false, version = "0.5.0" }
153+
rustpython-pylib = { path = "crates/pylib", version = "0.5.0" }
154+
rustpython-stdlib = { path = "crates/stdlib", default-features = false, version = "0.5.0" }
155+
rustpython-sre_engine = { path = "crates/sre_engine", version = "0.5.0" }
156+
rustpython-wtf8 = { path = "crates/wtf8", version = "0.5.0" }
157+
rustpython-doc = { path = "crates/doc", version = "0.5.0" }
158158

159159
# Ruff tag 0.15.6 is based on commit e4c7f357777a2fdd34dbe6a98b1b7d3e7488f675
160160
# at the time of this capture. We use the commit hash to ensure reproducible builds.

0 commit comments

Comments
 (0)