fix ci

EspressoSystems · Jan 10, 2025 · 410ad34 · 410ad34
1 parent 3ab0a56
commit 410ad34
Showing 1 changed file with 0 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -147,25 +147,14 @@ jobs:
         uses: actions/cache@v3
         with:
           path: |
-<<<<<<< HEAD
-            ~/.cargo/registry/
-            ~/.cargo/git/
-            arbitrator/**/target/
-=======
             ~/.cargo/
             arbitrator/target/
->>>>>>> edff8997a6257f1019a80d4491ab6f223189dceb
             arbitrator/wasm-libraries/target/
             arbitrator/wasm-libraries/soft-float/
             target/etc/initial-machine-cache/
-<<<<<<< HEAD
-          key: v2-${{ runner.os }}-cargo-${{ steps.install-rust.outputs.rustc_hash }}-min-${{ hashFiles('arbitrator/Cargo.lock') }}-${{ matrix.test-mode }}
-          restore-keys: v1-${{ runner.os }}-cargo-${{ steps.install-rust.outputs.rustc_hash }}-
-=======
             /home/runner/.rustup/toolchains/
           key: ${{ runner.os }}-cargo-${{ steps.install-rust.outputs.rustc_hash }}-min-${{ hashFiles('arbitrator/Cargo.lock') }}-${{ matrix.test-mode }}
           restore-keys: ${{ runner.os }}-cargo-${{ steps.install-rust.outputs.rustc_hash }}-
->>>>>>> edff8997a6257f1019a80d4491ab6f223189dceb
 
       - name: Cache cbrotli
         uses: actions/cache@v3