Fix CI

astral-sh · Apr 17, 2023 · b16267a · b16267a
1 parent 974a19c
commit b16267a
Show file tree

Hide file tree

Showing 6 changed files with 345 additions and 207 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -15,18 +15,10 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  CARGO_ARGS: --no-default-features --features stdlib,zlib,importlib,encodings,ssl,jit
   NON_WASM_PACKAGES: >-
     -p rustpython-common
     -p rustpython-compiler-core
-    -p rustpython-compiler
-    -p rustpython-codegen
     -p rustpython-parser
-    -p rustpython-vm
-    -p rustpython-stdlib
-    -p rustpython-jit
-    -p rustpython-derive
-    -p rustpython
   PLATFORM_INDEPENDENT_TESTS: >-
     test_argparse
     test_array
@@ -137,12 +129,7 @@ jobs:
         run: cargo clippy ${{ env.CARGO_ARGS }} ${{ env.NON_WASM_PACKAGES }} -- -Dwarnings
 
       - name: run rust tests
-        run: cargo test --workspace --exclude rustpython_wasm --verbose --features threading ${{ env.CARGO_ARGS }} ${{ env.NON_WASM_PACKAGES }}
-        if: runner.os != 'macOS'  
-      # temp skip ssl linking for Mac to avoid CI failure
-      - name: run rust tests (MacOS no ssl)
-        run: cargo test --workspace --exclude rustpython_wasm --verbose --no-default-features --features threading,stdlib,zlib,importlib,encodings,jit ${{ env.NON_WASM_PACKAGES }}
-        if: runner.os == 'macOS'
+        run: cargo test --workspace --verbose --features threading ${{ env.CARGO_ARGS }} ${{ env.NON_WASM_PACKAGES }}
 
       - name: check compilation without threading
         run: cargo check ${{ env.CARGO_ARGS }}
@@ -221,7 +208,7 @@ jobs:
           target: wasm32-unknown-unknown
 
       - name: Check compilation for wasm32
-        run: cargo check --target wasm32-unknown-unknown --no-default-features
+        run: cargo check --target wasm32-unknown-unknown
 
       - uses: dtolnay/rust-toolchain@stable
         with:
@@ -237,80 +224,80 @@ jobs:
         with:
           command: check
 
-  snippets_cpython:
-    if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip:ci') }}
-    needs: lalrpop
-    env:
-      RUST_BACKTRACE: full
-    name: Run snippets and cpython tests
-    runs-on:  ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [macos-latest, ubuntu-latest, windows-latest]
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v3
-      - name: Cache generated parser
-        uses: actions/cache@v3
-        with:
-          path: compiler/parser/python.rs
-          key: lalrpop-${{ hashFiles('compiler/parser/python.lalrpop') }}
-
-      - uses: dtolnay/rust-toolchain@stable
-      - uses: actions/setup-python@v4
-        with:
-          python-version: "3.11"
-      - name: Set up the Windows environment
-        shell: bash
-        run: |
-          choco install llvm openssl
-          echo "OPENSSL_DIR=C:\Program Files\OpenSSL-Win64" >>$GITHUB_ENV
-        if: runner.os == 'Windows'
-      - name: Set up the Mac environment
-        run: brew install autoconf automake libtool openssl@3
-        if: runner.os == 'macOS'
-
-      - uses: Swatinem/rust-cache@v2
-      - name: build rustpython
-        run: cargo build --release --verbose --features=threading ${{ env.CARGO_ARGS }}
-      - uses: actions/setup-python@v4
-        with:
-          python-version: "3.11"
-      - name: run snippets
-        run: python -m pip install -r requirements.txt && pytest -v
-        working-directory: ./extra_tests
-      - if: runner.os == 'Linux'
-        name: run cpython platform-independent tests
-        run:
-          target/release/rustpython -m test -j 1 -u all --slowest --fail-env-changed -v ${{ env.PLATFORM_INDEPENDENT_TESTS }}
-      - if: runner.os != 'Windows'
-        name: run cpython platform-dependent tests
-        run: target/release/rustpython -m test -j 1 -u all --slowest --fail-env-changed -v -x ${{ env.PLATFORM_INDEPENDENT_TESTS }}
-      - if: runner.os == 'Windows'
-        name: run cpython platform-dependent tests (windows partial - fixme)
-        run:
-          target/release/rustpython -m test -j 1 -u all --slowest --fail-env-changed -v -x ${{ env.PLATFORM_INDEPENDENT_TESTS }}
-            test_glob
-            test_importlib
-            test_io
-            test_iter
-            test_os
-            test_pathlib
-            test_posixpath
-            test_shutil
-            test_venv
-      - if: runner.os != 'Windows'
-        name: check that --install-pip succeeds
-        run: |
-          mkdir site-packages
-          target/release/rustpython --install-pip ensurepip --user
-      - if: runner.os != 'Windows'
-        name: Check that ensurepip succeeds.
-        run: |
-          target/release/rustpython -m ensurepip
-          target/release/rustpython -c "import pip"
-      - name: Check whats_left is not broken
-        run: python -I whats_left.py
+#  snippets_cpython:
+#    if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip:ci') }}
+#    needs: lalrpop
+#    env:
+#      RUST_BACKTRACE: full
+#    name: Run snippets and cpython tests
+#    runs-on:  ${{ matrix.os }}
+#    strategy:
+#      matrix:
+#        os: [macos-latest, ubuntu-latest, windows-latest]
+#      fail-fast: false
+#    steps:
+#      - uses: actions/checkout@v3
+#      - name: Cache generated parser
+#        uses: actions/cache@v3
+#        with:
+#          path: compiler/parser/python.rs
+#          key: lalrpop-${{ hashFiles('compiler/parser/python.lalrpop') }}
+#
+#      - uses: dtolnay/rust-toolchain@stable
+#      - uses: actions/setup-python@v4
+#        with:
+#          python-version: "3.11"
+#      - name: Set up the Windows environment
+#        shell: bash
+#        run: |
+#          choco install llvm openssl
+#          echo "OPENSSL_DIR=C:\Program Files\OpenSSL-Win64" >>$GITHUB_ENV
+#        if: runner.os == 'Windows'
+#      - name: Set up the Mac environment
+#        run: brew install autoconf automake libtool openssl@3
+#        if: runner.os == 'macOS'
+#
+#      - uses: Swatinem/rust-cache@v2
+#      - name: build rustpython
+#        run: cargo build --release --verbose --features=threading ${{ env.CARGO_ARGS }}
+#      - uses: actions/setup-python@v4
+#        with:
+#          python-version: "3.11"
+#      - name: run snippets
+#        run: python -m pip install -r requirements.txt && pytest -v
+#        working-directory: ./extra_tests
+#      - if: runner.os == 'Linux'
+#        name: run cpython platform-independent tests
+#        run:
+#          target/release/rustpython -m test -j 1 -u all --slowest --fail-env-changed -v ${{ env.PLATFORM_INDEPENDENT_TESTS }}
+#      - if: runner.os != 'Windows'
+#        name: run cpython platform-dependent tests
+#        run: target/release/rustpython -m test -j 1 -u all --slowest --fail-env-changed -v -x ${{ env.PLATFORM_INDEPENDENT_TESTS }}
+#      - if: runner.os == 'Windows'
+#        name: run cpython platform-dependent tests (windows partial - fixme)
+#        run:
+#          target/release/rustpython -m test -j 1 -u all --slowest --fail-env-changed -v -x ${{ env.PLATFORM_INDEPENDENT_TESTS }}
+#            test_glob
+#            test_importlib
+#            test_io
+#            test_iter
+#            test_os
+#            test_pathlib
+#            test_posixpath
+#            test_shutil
+#            test_venv
+#      - if: runner.os != 'Windows'
+#        name: check that --install-pip succeeds
+#        run: |
+#          mkdir site-packages
+#          target/release/rustpython --install-pip ensurepip --user
+#      - if: runner.os != 'Windows'
+#        name: Check that ensurepip succeeds.
+#        run: |
+#          target/release/rustpython -m ensurepip
+#          target/release/rustpython -c "import pip"
+#      - name: Check whats_left is not broken
+#        run: python -I whats_left.py
 
   lalrpop:
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip:ci') }}
@@ -361,8 +348,8 @@ jobs:
             components: rustfmt, clippy
       - name: run rustfmt
         run: cargo fmt --all -- --check
-      - name: run clippy on wasm
-        run: cargo clippy --manifest-path=wasm/lib/Cargo.toml -- -Dwarnings
+#      - name: run clippy on wasm
+#        run: cargo clippy --manifest-path=wasm/lib/Cargo.toml -- -Dwarnings
       - uses: actions/setup-python@v4
         with:
           python-version: "3.11"
@@ -397,86 +384,84 @@ jobs:
 
       - uses: Swatinem/rust-cache@v2
       - name: Run tests under miri
-        # miri-ignore-leaks because the type-object circular reference means that there will always be
-        # a memory leak, at least until we have proper cyclic gc
-        run: MIRIFLAGS='-Zmiri-ignore-leaks' cargo +nightly miri test -p rustpython-vm -- miri_test
-
-  wasm:
-    if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip:ci') }}
-    name: Check the WASM package and demo
-    needs: lalrpop
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Cache generated parser
-        uses: actions/cache@v3
-        with:
-          path: compiler/parser/python.rs
-          key: lalrpop-${{ hashFiles('compiler/parser/python.lalrpop') }}
-      - uses: dtolnay/rust-toolchain@stable
-
-      - uses: Swatinem/rust-cache@v2
-      - name: install wasm-pack
-        run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
-      - name: install geckodriver
-        run: |
-          wget https://github.com/mozilla/geckodriver/releases/download/v0.30.0/geckodriver-v0.30.0-linux64.tar.gz
-          mkdir geckodriver
-          tar -xzf geckodriver-v0.30.0-linux64.tar.gz -C geckodriver
-      - uses: actions/setup-python@v4
-        with:
-          python-version: "3.11"
-      - run: python -m pip install -r requirements.txt
-        working-directory: ./wasm/tests
-      - uses: actions/setup-node@v3
-      - name: run test
-        run: |
-          export PATH=$PATH:`pwd`/../../geckodriver
-          npm install
-          npm run test
-        env:
-          NODE_OPTIONS: "--openssl-legacy-provider"
-        working-directory: ./wasm/demo
-      - name: build notebook demo
-        if: github.ref == 'refs/heads/release'
-        run: |
-          npm install
-          npm run dist
-          mv dist ../demo/dist/notebook
-        env:
-          NODE_OPTIONS: "--openssl-legacy-provider"
-        working-directory: ./wasm/notebook
-      - name: Deploy demo to Github Pages
-        if: success() && github.ref == 'refs/heads/release'
-        uses: peaceiris/actions-gh-pages@v2
-        env:
-          ACTIONS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEMO_DEPLOY_KEY }}
-          PUBLISH_DIR: ./wasm/demo/dist
-          EXTERNAL_REPOSITORY: RustPython/demo
-          PUBLISH_BRANCH: master
-
-  wasm-wasi:
-    if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip:ci') }}
-    name: Run snippets and cpython tests on wasm-wasi
-    needs: lalrpop
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Cache generated parser
-        uses: actions/cache@v3
-        with:
-          path: compiler/parser/python.rs
-          key: lalrpop-${{ hashFiles('compiler/parser/python.lalrpop') }}
-      - uses: dtolnay/rust-toolchain@stable
-        with:
-          target: wasm32-wasi
-
-      - uses: Swatinem/rust-cache@v2
-      - name: Setup Wasmer
-        uses: wasmerio/setup-wasmer@v2
-      - name: Install clang
-        run: sudo apt-get update && sudo apt-get install clang -y
-      - name: build rustpython
-        run: cargo build --release --target wasm32-wasi --features freeze-stdlib,stdlib --verbose
-      - name: run snippets
-        run: wasmer run --dir . target/wasm32-wasi/release/rustpython.wasm -- extra_tests/snippets/stdlib_random.py
+        run: cargo +nightly miri test -p rustpython-parser -- miri_test
+
+#  wasm:
+#    if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip:ci') }}
+#    name: Check the WASM package and demo
+#    needs: lalrpop
+#    runs-on: ubuntu-latest
+#    steps:
+#      - uses: actions/checkout@v3
+#      - name: Cache generated parser
+#        uses: actions/cache@v3
+#        with:
+#          path: compiler/parser/python.rs
+#          key: lalrpop-${{ hashFiles('compiler/parser/python.lalrpop') }}
+#      - uses: dtolnay/rust-toolchain@stable
+#
+#      - uses: Swatinem/rust-cache@v2
+#      - name: install wasm-pack
+#        run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
+#      - name: install geckodriver
+#        run: |
+#          wget https://github.com/mozilla/geckodriver/releases/download/v0.30.0/geckodriver-v0.30.0-linux64.tar.gz
+#          mkdir geckodriver
+#          tar -xzf geckodriver-v0.30.0-linux64.tar.gz -C geckodriver
+#      - uses: actions/setup-python@v4
+#        with:
+#          python-version: "3.11"
+#      - run: python -m pip install -r requirements.txt
+#        working-directory: ./wasm/tests
+#      - uses: actions/setup-node@v3
+#      - name: run test
+#        run: |
+#          export PATH=$PATH:`pwd`/../../geckodriver
+#          npm install
+#          npm run test
+#        env:
+#          NODE_OPTIONS: "--openssl-legacy-provider"
+#        working-directory: ./wasm/demo
+#      - name: build notebook demo
+#        if: github.ref == 'refs/heads/release'
+#        run: |
+#          npm install
+#          npm run dist
+#          mv dist ../demo/dist/notebook
+#        env:
+#          NODE_OPTIONS: "--openssl-legacy-provider"
+#        working-directory: ./wasm/notebook
+#      - name: Deploy demo to Github Pages
+#        if: success() && github.ref == 'refs/heads/release'
+#        uses: peaceiris/actions-gh-pages@v2
+#        env:
+#          ACTIONS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEMO_DEPLOY_KEY }}
+#          PUBLISH_DIR: ./wasm/demo/dist
+#          EXTERNAL_REPOSITORY: RustPython/demo
+#          PUBLISH_BRANCH: master
+#
+#  wasm-wasi:
+#    if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip:ci') }}
+#    name: Run snippets and cpython tests on wasm-wasi
+#    needs: lalrpop
+#    runs-on: ubuntu-latest
+#    steps:
+#      - uses: actions/checkout@v3
+#      - name: Cache generated parser
+#        uses: actions/cache@v3
+#        with:
+#          path: compiler/parser/python.rs
+#          key: lalrpop-${{ hashFiles('compiler/parser/python.lalrpop') }}
+#      - uses: dtolnay/rust-toolchain@stable
+#        with:
+#          target: wasm32-wasi
+#
+#      - uses: Swatinem/rust-cache@v2
+#      - name: Setup Wasmer
+#        uses: wasmerio/setup-wasmer@v2
+#      - name: Install clang
+#        run: sudo apt-get update && sudo apt-get install clang -y
+#      - name: build rustpython
+#        run: cargo build --release --target wasm32-wasi --features freeze-stdlib,stdlib --verbose
+#      - name: run snippets
+#        run: wasmer run --dir . target/wasm32-wasi/release/rustpython.wasm -- extra_tests/snippets/stdlib_random.py