Skip to content

Commit b641625

Browse files
committed
Merge remote-tracking branch 'upstream/main' into parallel-ci
2 parents ccb66b1 + b11b8e6 commit b641625

File tree

19 files changed

+592
-236
lines changed

19 files changed

+592
-236
lines changed

.github/workflows/ci.yaml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,9 @@ jobs:
353353
- run: ruff format --check
354354

355355
- name: install prettier
356-
run: yarn global add prettier && echo "$(yarn global bin)" >>$GITHUB_PATH
356+
run: |
357+
yarn global add prettier
358+
yarn global bin >> "$GITHUB_PATH"
357359
358360
- name: check wasm code with prettier
359361
# prettier doesn't handle ignore files very well: https://github.com/prettier/prettier/issues/8506
@@ -429,7 +431,8 @@ jobs:
429431
cache-dependency-path: "wasm/demo/package-lock.json"
430432
- name: run test
431433
run: |
432-
export PATH=$PATH:`pwd`/../../geckodriver
434+
driver_path="$(pwd)/../../geckodriver"
435+
export PATH="$PATH:${driver_path}"
433436
npm install
434437
npm run test
435438
env:
@@ -493,6 +496,6 @@ jobs:
493496
- name: build rustpython
494497
run: cargo build --release --target wasm32-wasip1 --features freeze-stdlib,stdlib --verbose
495498
- name: run snippets
496-
run: wasmer run --dir `pwd` target/wasm32-wasip1/release/rustpython.wasm -- `pwd`/extra_tests/snippets/stdlib_random.py
499+
run: wasmer run --dir $(pwd) target/wasm32-wasip1/release/rustpython.wasm -- "$(pwd)/extra_tests/snippets/stdlib_random.py"
497500
- name: run cpython unittest
498-
run: wasmer run --dir `pwd` target/wasm32-wasip1/release/rustpython.wasm -- `pwd`/Lib/test/test_int.py
501+
run: wasmer run --dir $(pwd) target/wasm32-wasip1/release/rustpython.wasm -- "$(pwd)/Lib/test/test_int.py"

.github/workflows/pr-format.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ concurrency:
1313
group: format-check-${{ github.event.pull_request.number }}
1414
cancel-in-progress: true
1515

16+
env:
17+
PYTHON_VERSION: "3.14.3"
18+
1619
jobs:
1720
format_check:
1821
permissions:
@@ -25,6 +28,8 @@ jobs:
2528
with:
2629
persist-credentials: false
2730

31+
- uses: reviewdog/action-actionlint@0d952c597ef8459f634d7145b0b044a9699e5e43 # v1.71.0
32+
2833
- name: Setup Rust
2934
uses: dtolnay/rust-toolchain@stable
3035
with:
@@ -45,6 +50,10 @@ jobs:
4550
- name: Run ruff check import sorting
4651
run: ruff check --select I --fix
4752

53+
- uses: actions/setup-python@v6.2.0
54+
with:
55+
python-version: ${{ env.PYTHON_VERSION }}
56+
4857
- name: Run generate_opcode_metadata.py
4958
run: python scripts/generate_opcode_metadata.py
5059

0 commit comments

Comments
 (0)