diff --git a/.github/workflows/common.yml b/.github/workflows/common.yml index eaaed7d2b..461363963 100644 --- a/.github/workflows/common.yml +++ b/.github/workflows/common.yml @@ -35,21 +35,10 @@ jobs: go-version: 1.18.x - name: Checkout code uses: actions/checkout@v2 - - name: Cache cargo registry - uses: actions/cache@v2 + - name: Cache cargo + uses: Swatinem/rust-cache@v2 with: - path: ~/.cargo/registry - key: ${{ runner.os }}-roller-cargo-registry-${{ hashFiles('common/libzkp/impl/Cargo.lock') }} - - name: Cache cargo index - uses: actions/cache@v2 - with: - path: ~/.cargo/git - key: ${{ runner.os }}-roller-cargo-index-${{ hashFiles('common/libzkp/impl/Cargo.lock') }} - - name: Cache cargo target - uses: actions/cache@v2 - with: - path: /home/runner/work/scroll/scroll/common/libzkp/impl/target - key: ${{ runner.os }}-roller-cargo-build-target-${{ hashFiles('common/libzkp/impl/Cargo.lock') }} + workspaces: "common/libzkp/impl -> target" - name: Lint run: | rm -rf $HOME/.cache/golangci-lint diff --git a/.github/workflows/coordinator.yml b/.github/workflows/coordinator.yml index 9b12d1d5a..b1732ff15 100644 --- a/.github/workflows/coordinator.yml +++ b/.github/workflows/coordinator.yml @@ -35,21 +35,6 @@ jobs: go-version: 1.18.x - name: Checkout code uses: actions/checkout@v2 - - name: Cache cargo registry - uses: actions/cache@v2 - with: - path: ~/.cargo/registry - key: ${{ runner.os }}-roller-cargo-registry-${{ hashFiles('common/libzkp/impl/Cargo.lock') }} - - name: Cache cargo index - uses: actions/cache@v2 - with: - path: ~/.cargo/git - key: ${{ runner.os }}-roller-cargo-index-${{ hashFiles('common/libzkp/impl/Cargo.lock') }} - - name: Cache cargo target - uses: actions/cache@v2 - with: - path: /home/runner/work/scroll/scroll/common/libzkp/impl/target - key: ${{ runner.os }}-roller-cargo-build-target-${{ hashFiles('common/libzkp/impl/Cargo.lock') }} - name: Lint run: | rm -rf $HOME/.cache/golangci-lint diff --git a/.github/workflows/roller.yml b/.github/workflows/roller.yml index bb0370a46..6d02da450 100644 --- a/.github/workflows/roller.yml +++ b/.github/workflows/roller.yml @@ -35,21 +35,10 @@ jobs: go-version: 1.18.x - name: Checkout code uses: actions/checkout@v2 - - name: Cache cargo registry - uses: actions/cache@v2 + - name: Cache cargo + uses: Swatinem/rust-cache@v2 with: - path: ~/.cargo/registry - key: ${{ runner.os }}-roller-cargo-registry-${{ hashFiles('common/libzkp/impl/Cargo.lock') }} - - name: Cache cargo index - uses: actions/cache@v2 - with: - path: ~/.cargo/git - key: ${{ runner.os }}-roller-cargo-index-${{ hashFiles('common/libzkp/impl/Cargo.lock') }} - - name: Cache cargo target - uses: actions/cache@v2 - with: - path: /home/runner/work/scroll/scroll/common/libzkp/impl/target - key: ${{ runner.os }}-roller-cargo-build-target-${{ hashFiles('common/libzkp/impl/Cargo.lock') }} + workspaces: "common/libzkp/impl -> target" - name: Test run: | make roller