fix: toolchain install from repo always

succinctlabs · Nov 26, 2024 · c5c777d · c5c777d
1 parent 19721cc
commit c5c777d
Showing 1 changed file with 28 additions and 37 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -37,11 +37,11 @@ jobs:
       - name: Setup CI
         uses: ./.github/actions/setup
 
-      - name: Install SP1 toolchain
+      - name: Install SP1 toolchain from repo
         run: |
-          curl -L https://sp1.succinct.xyz | bash
-          ~/.sp1/bin/sp1up 
-          ~/.sp1/bin/cargo-prove prove --version
+          cargo run -p sp1-cli -- prove install-toolchain
+          cd crates/cli
+          cargo install --force --locked --path .
 
       - name: Run cargo check
         uses: actions-rs/cargo@v1
@@ -80,11 +80,11 @@ jobs:
       - name: Setup CI
         uses: ./.github/actions/setup
 
-      - name: Install SP1 toolchain
+      - name: Install SP1 toolchain from repo
         run: |
-          curl -L https://sp1.succinct.xyz | bash
-          ~/.sp1/bin/sp1up 
-          ~/.sp1/bin/cargo-prove prove --version
+          cargo run -p sp1-cli -- prove install-toolchain
+          cd crates/cli
+          cargo install --force --locked --path .
 
       - name: Run cargo check
         uses: actions-rs/cargo@v1
@@ -116,11 +116,11 @@ jobs:
       - name: Setup CI
         uses: ./.github/actions/setup
 
-      - name: Install SP1 toolchain
+      - name: Install SP1 toolchain from repo
         run: |
-          curl -L https://sp1.succinct.xyz | bash
-          ~/.sp1/bin/sp1up 
-          ~/.sp1/bin/cargo-prove prove --version
+          cargo run -p sp1-cli -- prove install-toolchain
+          cd crates/cli
+          cargo install --force --locked --path .
 
       - name: Run cargo fmt
         uses: actions-rs/cargo@v1
@@ -158,11 +158,11 @@ jobs:
       - name: Setup CI
         uses: ./.github/actions/setup
 
-      - name: Install SP1 toolchain
+      - name: Install SP1 toolchain from repo
         run: |
-          curl -L https://sp1.succinct.xyz | bash
-          ~/.sp1/bin/sp1up 
-          ~/.sp1/bin/cargo-prove prove --version
+          cargo run -p sp1-cli -- prove install-toolchain
+          cd crates/cli
+          cargo install --force --locked --path .
 
       - name: Check workspace no features
         uses: actions-rs/cargo@v1
@@ -201,9 +201,11 @@ jobs:
       - name: Setup CI
         uses: ./.github/actions/setup
 
-      - name: Install SP1 toolchain
+      - name: Install SP1 toolchain from repo
         run: |
           cargo run -p sp1-cli -- prove install-toolchain
+          cd crates/cli
+          cargo install --force --locked --path .
 
       - name: Run cargo fmt
         run: |
@@ -232,17 +234,11 @@ jobs:
       - name: Setup CI
         uses: ./.github/actions/setup
 
-      - name: Install SP1 toolchain
-        run: |
-          curl -L https://sp1.succinct.xyz | bash
-          ~/.sp1/bin/sp1up 
-          ~/.sp1/bin/cargo-prove prove --version
-
-      - name: Install SP1 CLI
+      - name: Install SP1 toolchain from repo
         run: |
+          cargo run -p sp1-cli -- prove install-toolchain
           cd crates/cli
           cargo install --force --locked --path .
-          cd ~
 
       - name: Run cargo prove new
         run: |
@@ -271,11 +267,11 @@ jobs:
       - name: Setup CI
         uses: ./.github/actions/setup
 
-      - name: Install SP1 toolchain
+      - name: Install SP1 toolchain from repo
         run: |
-          curl -L https://sp1.succinct.xyz | bash
-          ~/.sp1/bin/sp1up 
-          ~/.sp1/bin/cargo-prove prove --version
+          cargo run -p sp1-cli -- prove install-toolchain
+          cd crates/cli
+          cargo install --force --locked --path .
 
       - name: Run Evaluation
         run: |
@@ -303,6 +299,7 @@ jobs:
       [
         runs-on,
         "ram=${{ matrix.mem_limit}}",
+        disk=large,
         family=c7a,
         image=ubuntu22-full-x64,
         "run-id=${{ github.run_id }}",
@@ -316,17 +313,11 @@ jobs:
       - name: Setup CI
         uses: ./.github/actions/setup
 
-      - name: Install SP1 toolchain
-        run: |
-          curl -L https://sp1.succinct.xyz | bash
-          ~/.sp1/bin/sp1up
-          ~/.sp1/bin/cargo-prove prove --version
-
-      - name: Install SP1 CLI
+      - name: Install SP1 toolchain from repo
         run: |
+          cargo run -p sp1-cli -- prove install-toolchain
           cd crates/cli
           cargo install --force --locked --path .
-          cd ~
 
       - name: Run tendermint script
         run: |