From 7b7e727a81c9b92b7affd833d8b87c5a768bc94d Mon Sep 17 00:00:00 2001 From: Lucas Clemente Vella Date: Wed, 2 Oct 2024 14:07:53 +0100 Subject: [PATCH] Using Warpbuild instead of BuildJet (#1860) BuildJet cache is broken and they won't answer support ticket. --- .github/workflows/build-cache.yml | 17 ++++++++++++++--- .github/workflows/pr-tests.yml | 16 ++++++---------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build-cache.yml b/.github/workflows/build-cache.yml index bc8a44a25..ef429f0ba 100644 --- a/.github/workflows/build-cache.yml +++ b/.github/workflows/build-cache.yml @@ -9,7 +9,7 @@ env: jobs: build: - runs-on: buildjet-4vcpu-ubuntu-2204 + runs-on: warp-ubuntu-latest-x64-4x steps: - uses: actions/checkout@v4 @@ -29,8 +29,19 @@ jobs: run: cargo build --all-targets --all --all-features --profile pr-tests - name: Check without Halo2 run: cargo check --all --no-default-features --profile pr-tests + - name: Delete previous cache + uses: WarpBuilds/cache@v1 + with: + path: | + ~/.cargo/registry/index/ + ~/.cargo/registry/cache/ + ~/.cargo/git/db/ + target/ + Cargo.lock + key: ${{ runner.os }}-cargo-pr-tests + delete-cache: true - name: ⚡ Save rust cache - uses: buildjet/cache/save@v4 + uses: WarpBuilds/cache/save@v1 with: path: | ~/.cargo/registry/index/ @@ -38,4 +49,4 @@ jobs: ~/.cargo/git/db/ target/ Cargo.lock - key: ${{ runner.os }}-cargo-pr-tests-${{ hashFiles('**/Cargo.lock') }} + key: ${{ runner.os }}-cargo-pr-tests diff --git a/.github/workflows/pr-tests.yml b/.github/workflows/pr-tests.yml index 59bc48e2e..09a427609 100644 --- a/.github/workflows/pr-tests.yml +++ b/.github/workflows/pr-tests.yml @@ -20,7 +20,7 @@ env: jobs: build: - runs-on: buildjet-4vcpu-ubuntu-2204 + runs-on: warp-ubuntu-latest-x64-4x steps: - uses: actions/checkout@v4 @@ -28,7 +28,7 @@ jobs: submodules: recursive - name: ⚡ Restore rust cache id: cache - uses: buildjet/cache/restore@v4 + uses: WarpBuilds/cache/restore@v1 with: path: | ~/.cargo/registry/index/ @@ -36,9 +36,7 @@ jobs: ~/.cargo/git/db/ target/ Cargo.lock - key: ${{ runner.os }}-cargo-pr-tests-${{ hashFiles('**/Cargo.lock') }} - restore-keys: | - ${{ runner.os }}-cargo-pr-tests- + key: ${{ runner.os }}-cargo-pr-tests - name: Install Rust toolchain 1.81 (with clippy and rustfmt) run: rustup toolchain install 1.81-x86_64-unknown-linux-gnu && rustup component add clippy --toolchain 1.81-x86_64-unknown-linux-gnu && rustup component add rustfmt --toolchain 1.81-x86_64-unknown-linux-gnu - name: Install EStarkPolygon prover dependencies @@ -105,7 +103,7 @@ jobs: POWDR_STD: ${{ github.workspace }}/std/ run_examples: - runs-on: ubuntu-latest + runs-on: warp-ubuntu-latest-x64-4x steps: - uses: actions/checkout@v4 @@ -113,7 +111,7 @@ jobs: submodules: recursive - name: ⚡ Restore rust cache id: cache - uses: actions/cache/restore@v4 + uses: WarpBuilds/cache/restore@v1 with: path: | ~/.cargo/registry/index/ @@ -121,9 +119,7 @@ jobs: ~/.cargo/git/db/ target/ Cargo.lock - key: ${{ runner.os }}-cargo-pr-tests-${{ hashFiles('**/Cargo.lock') }} - restore-keys: | - ${{ runner.os }}-cargo-pr-tests- + key: ${{ runner.os }}-cargo-pr-tests - name: Install Rust toolchain 1.81 (with clippy and rustfmt) run: rustup toolchain install 1.81-x86_64-unknown-linux-gnu && rustup component add clippy --toolchain 1.81-x86_64-unknown-linux-gnu && rustup component add rustfmt --toolchain 1.81-x86_64-unknown-linux-gnu - name: Run examples