Skip to content
This repository was archived by the owner on May 11, 2023. It is now read-only.

Commit 29ff5d8

Browse files
committed
Fix CI
1 parent 974a19c commit 29ff5d8

File tree

6 files changed

+343
-200
lines changed

6 files changed

+343
-200
lines changed

.github/workflows/ci.yaml

+157-167
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,10 @@ concurrency:
1515
cancel-in-progress: true
1616

1717
env:
18-
CARGO_ARGS: --no-default-features --features stdlib,zlib,importlib,encodings,ssl,jit
1918
NON_WASM_PACKAGES: >-
2019
-p rustpython-common
2120
-p rustpython-compiler-core
22-
-p rustpython-compiler
23-
-p rustpython-codegen
2421
-p rustpython-parser
25-
-p rustpython-vm
26-
-p rustpython-stdlib
27-
-p rustpython-jit
28-
-p rustpython-derive
29-
-p rustpython
3022
PLATFORM_INDEPENDENT_TESTS: >-
3123
test_argparse
3224
test_array
@@ -237,80 +229,80 @@ jobs:
237229
with:
238230
command: check
239231

240-
snippets_cpython:
241-
if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip:ci') }}
242-
needs: lalrpop
243-
env:
244-
RUST_BACKTRACE: full
245-
name: Run snippets and cpython tests
246-
runs-on: ${{ matrix.os }}
247-
strategy:
248-
matrix:
249-
os: [macos-latest, ubuntu-latest, windows-latest]
250-
fail-fast: false
251-
steps:
252-
- uses: actions/checkout@v3
253-
- name: Cache generated parser
254-
uses: actions/cache@v3
255-
with:
256-
path: compiler/parser/python.rs
257-
key: lalrpop-${{ hashFiles('compiler/parser/python.lalrpop') }}
258-
259-
- uses: dtolnay/rust-toolchain@stable
260-
- uses: actions/setup-python@v4
261-
with:
262-
python-version: "3.11"
263-
- name: Set up the Windows environment
264-
shell: bash
265-
run: |
266-
choco install llvm openssl
267-
echo "OPENSSL_DIR=C:\Program Files\OpenSSL-Win64" >>$GITHUB_ENV
268-
if: runner.os == 'Windows'
269-
- name: Set up the Mac environment
270-
run: brew install autoconf automake libtool openssl@3
271-
if: runner.os == 'macOS'
272-
273-
- uses: Swatinem/rust-cache@v2
274-
- name: build rustpython
275-
run: cargo build --release --verbose --features=threading ${{ env.CARGO_ARGS }}
276-
- uses: actions/setup-python@v4
277-
with:
278-
python-version: "3.11"
279-
- name: run snippets
280-
run: python -m pip install -r requirements.txt && pytest -v
281-
working-directory: ./extra_tests
282-
- if: runner.os == 'Linux'
283-
name: run cpython platform-independent tests
284-
run:
285-
target/release/rustpython -m test -j 1 -u all --slowest --fail-env-changed -v ${{ env.PLATFORM_INDEPENDENT_TESTS }}
286-
- if: runner.os != 'Windows'
287-
name: run cpython platform-dependent tests
288-
run: target/release/rustpython -m test -j 1 -u all --slowest --fail-env-changed -v -x ${{ env.PLATFORM_INDEPENDENT_TESTS }}
289-
- if: runner.os == 'Windows'
290-
name: run cpython platform-dependent tests (windows partial - fixme)
291-
run:
292-
target/release/rustpython -m test -j 1 -u all --slowest --fail-env-changed -v -x ${{ env.PLATFORM_INDEPENDENT_TESTS }}
293-
test_glob
294-
test_importlib
295-
test_io
296-
test_iter
297-
test_os
298-
test_pathlib
299-
test_posixpath
300-
test_shutil
301-
test_venv
302-
- if: runner.os != 'Windows'
303-
name: check that --install-pip succeeds
304-
run: |
305-
mkdir site-packages
306-
target/release/rustpython --install-pip ensurepip --user
307-
- if: runner.os != 'Windows'
308-
name: Check that ensurepip succeeds.
309-
run: |
310-
target/release/rustpython -m ensurepip
311-
target/release/rustpython -c "import pip"
312-
- name: Check whats_left is not broken
313-
run: python -I whats_left.py
232+
# snippets_cpython:
233+
# if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip:ci') }}
234+
# needs: lalrpop
235+
# env:
236+
# RUST_BACKTRACE: full
237+
# name: Run snippets and cpython tests
238+
# runs-on: ${{ matrix.os }}
239+
# strategy:
240+
# matrix:
241+
# os: [macos-latest, ubuntu-latest, windows-latest]
242+
# fail-fast: false
243+
# steps:
244+
# - uses: actions/checkout@v3
245+
# - name: Cache generated parser
246+
# uses: actions/cache@v3
247+
# with:
248+
# path: compiler/parser/python.rs
249+
# key: lalrpop-${{ hashFiles('compiler/parser/python.lalrpop') }}
250+
#
251+
# - uses: dtolnay/rust-toolchain@stable
252+
# - uses: actions/setup-python@v4
253+
# with:
254+
# python-version: "3.11"
255+
# - name: Set up the Windows environment
256+
# shell: bash
257+
# run: |
258+
# choco install llvm openssl
259+
# echo "OPENSSL_DIR=C:\Program Files\OpenSSL-Win64" >>$GITHUB_ENV
260+
# if: runner.os == 'Windows'
261+
# - name: Set up the Mac environment
262+
# run: brew install autoconf automake libtool openssl@3
263+
# if: runner.os == 'macOS'
264+
#
265+
# - uses: Swatinem/rust-cache@v2
266+
# - name: build rustpython
267+
# run: cargo build --release --verbose --features=threading ${{ env.CARGO_ARGS }}
268+
# - uses: actions/setup-python@v4
269+
# with:
270+
# python-version: "3.11"
271+
# - name: run snippets
272+
# run: python -m pip install -r requirements.txt && pytest -v
273+
# working-directory: ./extra_tests
274+
# - if: runner.os == 'Linux'
275+
# name: run cpython platform-independent tests
276+
# run:
277+
# target/release/rustpython -m test -j 1 -u all --slowest --fail-env-changed -v ${{ env.PLATFORM_INDEPENDENT_TESTS }}
278+
# - if: runner.os != 'Windows'
279+
# name: run cpython platform-dependent tests
280+
# run: target/release/rustpython -m test -j 1 -u all --slowest --fail-env-changed -v -x ${{ env.PLATFORM_INDEPENDENT_TESTS }}
281+
# - if: runner.os == 'Windows'
282+
# name: run cpython platform-dependent tests (windows partial - fixme)
283+
# run:
284+
# target/release/rustpython -m test -j 1 -u all --slowest --fail-env-changed -v -x ${{ env.PLATFORM_INDEPENDENT_TESTS }}
285+
# test_glob
286+
# test_importlib
287+
# test_io
288+
# test_iter
289+
# test_os
290+
# test_pathlib
291+
# test_posixpath
292+
# test_shutil
293+
# test_venv
294+
# - if: runner.os != 'Windows'
295+
# name: check that --install-pip succeeds
296+
# run: |
297+
# mkdir site-packages
298+
# target/release/rustpython --install-pip ensurepip --user
299+
# - if: runner.os != 'Windows'
300+
# name: Check that ensurepip succeeds.
301+
# run: |
302+
# target/release/rustpython -m ensurepip
303+
# target/release/rustpython -c "import pip"
304+
# - name: Check whats_left is not broken
305+
# run: python -I whats_left.py
314306

315307
lalrpop:
316308
if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip:ci') }}
@@ -361,8 +353,8 @@ jobs:
361353
components: rustfmt, clippy
362354
- name: run rustfmt
363355
run: cargo fmt --all -- --check
364-
- name: run clippy on wasm
365-
run: cargo clippy --manifest-path=wasm/lib/Cargo.toml -- -Dwarnings
356+
# - name: run clippy on wasm
357+
# run: cargo clippy --manifest-path=wasm/lib/Cargo.toml -- -Dwarnings
366358
- uses: actions/setup-python@v4
367359
with:
368360
python-version: "3.11"
@@ -397,86 +389,84 @@ jobs:
397389

398390
- uses: Swatinem/rust-cache@v2
399391
- name: Run tests under miri
400-
# miri-ignore-leaks because the type-object circular reference means that there will always be
401-
# a memory leak, at least until we have proper cyclic gc
402-
run: MIRIFLAGS='-Zmiri-ignore-leaks' cargo +nightly miri test -p rustpython-vm -- miri_test
403-
404-
wasm:
405-
if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip:ci') }}
406-
name: Check the WASM package and demo
407-
needs: lalrpop
408-
runs-on: ubuntu-latest
409-
steps:
410-
- uses: actions/checkout@v3
411-
- name: Cache generated parser
412-
uses: actions/cache@v3
413-
with:
414-
path: compiler/parser/python.rs
415-
key: lalrpop-${{ hashFiles('compiler/parser/python.lalrpop') }}
416-
- uses: dtolnay/rust-toolchain@stable
417-
418-
- uses: Swatinem/rust-cache@v2
419-
- name: install wasm-pack
420-
run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
421-
- name: install geckodriver
422-
run: |
423-
wget https://github.com/mozilla/geckodriver/releases/download/v0.30.0/geckodriver-v0.30.0-linux64.tar.gz
424-
mkdir geckodriver
425-
tar -xzf geckodriver-v0.30.0-linux64.tar.gz -C geckodriver
426-
- uses: actions/setup-python@v4
427-
with:
428-
python-version: "3.11"
429-
- run: python -m pip install -r requirements.txt
430-
working-directory: ./wasm/tests
431-
- uses: actions/setup-node@v3
432-
- name: run test
433-
run: |
434-
export PATH=$PATH:`pwd`/../../geckodriver
435-
npm install
436-
npm run test
437-
env:
438-
NODE_OPTIONS: "--openssl-legacy-provider"
439-
working-directory: ./wasm/demo
440-
- name: build notebook demo
441-
if: github.ref == 'refs/heads/release'
442-
run: |
443-
npm install
444-
npm run dist
445-
mv dist ../demo/dist/notebook
446-
env:
447-
NODE_OPTIONS: "--openssl-legacy-provider"
448-
working-directory: ./wasm/notebook
449-
- name: Deploy demo to Github Pages
450-
if: success() && github.ref == 'refs/heads/release'
451-
uses: peaceiris/actions-gh-pages@v2
452-
env:
453-
ACTIONS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEMO_DEPLOY_KEY }}
454-
PUBLISH_DIR: ./wasm/demo/dist
455-
EXTERNAL_REPOSITORY: RustPython/demo
456-
PUBLISH_BRANCH: master
457-
458-
wasm-wasi:
459-
if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip:ci') }}
460-
name: Run snippets and cpython tests on wasm-wasi
461-
needs: lalrpop
462-
runs-on: ubuntu-latest
463-
steps:
464-
- uses: actions/checkout@v3
465-
- name: Cache generated parser
466-
uses: actions/cache@v3
467-
with:
468-
path: compiler/parser/python.rs
469-
key: lalrpop-${{ hashFiles('compiler/parser/python.lalrpop') }}
470-
- uses: dtolnay/rust-toolchain@stable
471-
with:
472-
target: wasm32-wasi
473-
474-
- uses: Swatinem/rust-cache@v2
475-
- name: Setup Wasmer
476-
uses: wasmerio/setup-wasmer@v2
477-
- name: Install clang
478-
run: sudo apt-get update && sudo apt-get install clang -y
479-
- name: build rustpython
480-
run: cargo build --release --target wasm32-wasi --features freeze-stdlib,stdlib --verbose
481-
- name: run snippets
482-
run: wasmer run --dir . target/wasm32-wasi/release/rustpython.wasm -- extra_tests/snippets/stdlib_random.py
392+
run: cargo +nightly miri test -p rustpython-parser -- miri_test
393+
394+
# wasm:
395+
# if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip:ci') }}
396+
# name: Check the WASM package and demo
397+
# needs: lalrpop
398+
# runs-on: ubuntu-latest
399+
# steps:
400+
# - uses: actions/checkout@v3
401+
# - name: Cache generated parser
402+
# uses: actions/cache@v3
403+
# with:
404+
# path: compiler/parser/python.rs
405+
# key: lalrpop-${{ hashFiles('compiler/parser/python.lalrpop') }}
406+
# - uses: dtolnay/rust-toolchain@stable
407+
#
408+
# - uses: Swatinem/rust-cache@v2
409+
# - name: install wasm-pack
410+
# run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
411+
# - name: install geckodriver
412+
# run: |
413+
# wget https://github.com/mozilla/geckodriver/releases/download/v0.30.0/geckodriver-v0.30.0-linux64.tar.gz
414+
# mkdir geckodriver
415+
# tar -xzf geckodriver-v0.30.0-linux64.tar.gz -C geckodriver
416+
# - uses: actions/setup-python@v4
417+
# with:
418+
# python-version: "3.11"
419+
# - run: python -m pip install -r requirements.txt
420+
# working-directory: ./wasm/tests
421+
# - uses: actions/setup-node@v3
422+
# - name: run test
423+
# run: |
424+
# export PATH=$PATH:`pwd`/../../geckodriver
425+
# npm install
426+
# npm run test
427+
# env:
428+
# NODE_OPTIONS: "--openssl-legacy-provider"
429+
# working-directory: ./wasm/demo
430+
# - name: build notebook demo
431+
# if: github.ref == 'refs/heads/release'
432+
# run: |
433+
# npm install
434+
# npm run dist
435+
# mv dist ../demo/dist/notebook
436+
# env:
437+
# NODE_OPTIONS: "--openssl-legacy-provider"
438+
# working-directory: ./wasm/notebook
439+
# - name: Deploy demo to Github Pages
440+
# if: success() && github.ref == 'refs/heads/release'
441+
# uses: peaceiris/actions-gh-pages@v2
442+
# env:
443+
# ACTIONS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEMO_DEPLOY_KEY }}
444+
# PUBLISH_DIR: ./wasm/demo/dist
445+
# EXTERNAL_REPOSITORY: RustPython/demo
446+
# PUBLISH_BRANCH: master
447+
#
448+
# wasm-wasi:
449+
# if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip:ci') }}
450+
# name: Run snippets and cpython tests on wasm-wasi
451+
# needs: lalrpop
452+
# runs-on: ubuntu-latest
453+
# steps:
454+
# - uses: actions/checkout@v3
455+
# - name: Cache generated parser
456+
# uses: actions/cache@v3
457+
# with:
458+
# path: compiler/parser/python.rs
459+
# key: lalrpop-${{ hashFiles('compiler/parser/python.lalrpop') }}
460+
# - uses: dtolnay/rust-toolchain@stable
461+
# with:
462+
# target: wasm32-wasi
463+
#
464+
# - uses: Swatinem/rust-cache@v2
465+
# - name: Setup Wasmer
466+
# uses: wasmerio/setup-wasmer@v2
467+
# - name: Install clang
468+
# run: sudo apt-get update && sudo apt-get install clang -y
469+
# - name: build rustpython
470+
# run: cargo build --release --target wasm32-wasi --features freeze-stdlib,stdlib --verbose
471+
# - name: run snippets
472+
# run: wasmer run --dir . target/wasm32-wasi/release/rustpython.wasm -- extra_tests/snippets/stdlib_random.py

0 commit comments

Comments
 (0)