From a9696d85012c92de7ef7a9a48eb5af4e83e3e955 Mon Sep 17 00:00:00 2001 From: Andrey Zgarbul Date: Sat, 14 Jan 2023 12:03:43 +0300 Subject: [PATCH 1/2] update ci actions --- .github/workflows/ci.yaml | 26 +++++++++++++------------- .github/workflows/cron-ci.yaml | 10 +++++----- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7d440fcd9..2c54ba00d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -111,7 +111,7 @@ jobs: os: [macos-latest, ubuntu-latest, windows-latest] fail-fast: false steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Cache generated parser uses: actions/cache@v2 with: @@ -129,7 +129,7 @@ jobs: - name: Set up the Mac environment run: brew install autoconf automake libtool if: runner.os == 'macOS' - - uses: Swatinem/rust-cache@v1 + - uses: Swatinem/rust-cache@v2 - name: run clippy run: cargo clippy ${{ env.CARGO_ARGS }} ${{ env.NON_WASM_PACKAGES }} -- -Dwarnings @@ -162,7 +162,7 @@ jobs: needs: lalrpop runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Cache generated parser uses: actions/cache@v2 with: @@ -233,7 +233,7 @@ jobs: os: [macos-latest, ubuntu-latest, windows-latest] fail-fast: false steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Cache generated parser uses: actions/cache@v2 with: @@ -253,7 +253,7 @@ jobs: - name: Set up the Mac environment run: brew install autoconf automake libtool if: runner.os == 'macOS' - - uses: Swatinem/rust-cache@v1 + - uses: Swatinem/rust-cache@v2 - name: build rustpython run: cargo build --release --verbose --features=threading ${{ env.CARGO_ARGS }} - uses: actions/setup-python@v2 @@ -296,7 +296,7 @@ jobs: os: [ubuntu-latest, windows-latest] runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Cache generated parser uses: actions/cache@v2 with: @@ -326,7 +326,7 @@ jobs: needs: lalrpop runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Cache generated parser uses: actions/cache@v2 with: @@ -362,7 +362,7 @@ jobs: needs: lalrpop runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Cache generated parser uses: actions/cache@v2 with: @@ -372,7 +372,7 @@ jobs: with: toolchain: nightly components: miri - - uses: Swatinem/rust-cache@v1 + - 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 @@ -384,14 +384,14 @@ jobs: needs: lalrpop runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Cache generated parser uses: actions/cache@v2 with: path: compiler/parser/python.rs key: lalrpop-${{ hashFiles('compiler/parser/python.lalrpop') }} - uses: dtolnay/rust-toolchain@stable - - uses: Swatinem/rust-cache@v1 + - 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 @@ -433,7 +433,7 @@ jobs: needs: lalrpop runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Cache generated parser uses: actions/cache@v2 with: @@ -442,7 +442,7 @@ jobs: - uses: dtolnay/rust-toolchain@stable with: target: wasm32-wasi - - uses: Swatinem/rust-cache@v1 + - uses: Swatinem/rust-cache@v2 - name: Setup Wasmer uses: wasmerio/setup-wasmer@v1 - name: Install clang diff --git a/.github/workflows/cron-ci.yaml b/.github/workflows/cron-ci.yaml index 453f4b8f6..6321a8060 100644 --- a/.github/workflows/cron-ci.yaml +++ b/.github/workflows/cron-ci.yaml @@ -14,7 +14,7 @@ jobs: needs: lalrpop runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Cache generated parser uses: actions/cache@v2 with: @@ -65,7 +65,7 @@ jobs: needs: lalrpop runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Cache generated parser uses: actions/cache@v2 with: @@ -100,7 +100,7 @@ jobs: needs: lalrpop runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Cache generated parser uses: actions/cache@v2 with: @@ -138,7 +138,7 @@ jobs: needs: lalrpop runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Cache generated parser uses: actions/cache@v2 with: @@ -191,7 +191,7 @@ jobs: os: [ubuntu-latest, windows-latest] runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Cache generated parser uses: actions/cache@v2 with: From 84897d4834f515d03a2706eecd12a33011b38506 Mon Sep 17 00:00:00 2001 From: Andrey Zgarbul Date: Sat, 14 Jan 2023 12:39:17 +0300 Subject: [PATCH 2/2] check caching --- .github/workflows/ci.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2c54ba00d..b0538abad 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -129,6 +129,7 @@ jobs: - name: Set up the Mac environment run: brew install autoconf automake libtool if: runner.os == 'macOS' + - uses: Swatinem/rust-cache@v2 - name: run clippy @@ -253,6 +254,7 @@ jobs: - name: Set up the Mac environment run: brew install autoconf automake libtool if: runner.os == 'macOS' + - uses: Swatinem/rust-cache@v2 - name: build rustpython run: cargo build --release --verbose --features=threading ${{ env.CARGO_ARGS }} @@ -372,6 +374,7 @@ jobs: with: toolchain: nightly components: miri + - 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 @@ -391,6 +394,7 @@ jobs: 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 @@ -442,6 +446,7 @@ jobs: - uses: dtolnay/rust-toolchain@stable with: target: wasm32-wasi + - uses: Swatinem/rust-cache@v2 - name: Setup Wasmer uses: wasmerio/setup-wasmer@v1