combine installation for estarkprover

powdr-labs · Dec 23, 2024 · 0f0c8a9 · 0f0c8a9
1 parent 1c95714
commit 0f0c8a9
Showing 1 changed file with 11 additions and 16 deletions.
diff --git a/.github/workflows/pr-tests.yml b/.github/workflows/pr-tests.yml
@@ -41,17 +41,12 @@ jobs:
       - name: Date of the restored cache
         run: cat target/cache-build-date.txt
         continue-on-error: true
-      - name: Install c++ dependencies for EStarkPolygon prover
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y uuid-dev libgrpc++-dev
-
 
       ##### The block below is shared between cache build and PR build workflows #####
       - name: Install EStarkPolygon prover dependencies
-        run: sudo apt-get update && sudo apt-get install -y nlohmann-json3-dev libpqxx-dev nasm
-      - name: Install Rust toolchain nightly-2024-12-17 (with clippy and rustfmt)
-        run: rustup toolchain install nightly-2024-12-17-x86_64-unknown-linux-gnu && rustup component add clippy --toolchain nightly-2024-12-17-x86_64-unknown-linux-gnu && rustup component add rustfmt --toolchain nightly-2024-12-17-x86_64-unknown-linux-gnu
+        run: sudo apt-get update && sudo apt-get install -y nlohmann-json3-dev libpqxx-dev nasm libgrpc++-dev uuid-dev
+      - name: Install Rust toolchain nightly-2024-09-21 (with clippy and rustfmt)
+        run: rustup toolchain install nightly-2024-09-21-x86_64-unknown-linux-gnu && rustup component add clippy --toolchain nightly-2024-09-21-x86_64-unknown-linux-gnu && rustup component add rustfmt --toolchain nightly-2024-09-21-x86_64-unknown-linux-gnu
       - name: Install Rust toolchain 1.81 (stable)
         run: rustup toolchain install 1.81-x86_64-unknown-linux-gnu
       - name: Set cargo to perform shallow clones
@@ -104,8 +99,8 @@ jobs:
           path: |
             ~/pilcom/node_modules
           key: ${{ runner.os }}-pilcom-node-modules
-      - name: Install Rust toolchain nightly-2024-12-17 (with clippy and rustfmt)
-        run: rustup toolchain install nightly-2024-12-17-x86_64-unknown-linux-gnu && rustup component add clippy --toolchain nightly-2024-12-17-x86_64-unknown-linux-gnu && rustup component add rustfmt --toolchain nightly-2024-12-17-x86_64-unknown-linux-gnu
+      - name: Install Rust toolchain nightly-2024-09-21 (with clippy and rustfmt)
+        run: rustup toolchain install nightly-2024-09-21-x86_64-unknown-linux-gnu && rustup component add clippy --toolchain nightly-2024-09-21-x86_64-unknown-linux-gnu && rustup component add rustfmt --toolchain nightly-2024-09-21-x86_64-unknown-linux-gnu
       - name: Install nightly-2024-08-01
         run: rustup toolchain install nightly-2024-08-01-x86_64-unknown-linux-gnu
       - name: Install std source
@@ -141,8 +136,8 @@ jobs:
             target/
             Cargo.lock
           key: ${{ runner.os }}-cargo-pr-tests
-      - name: Install Rust toolchain nightly-2024-12-17 (with clippy and rustfmt)
-        run: rustup toolchain install nightly-2024-12-17-x86_64-unknown-linux-gnu && rustup component add clippy --toolchain nightly-2024-12-17-x86_64-unknown-linux-gnu && rustup component add rustfmt --toolchain nightly-2024-12-17-x86_64-unknown-linux-gnu
+      - name: Install Rust toolchain nightly-2024-09-21 (with clippy and rustfmt)
+        run: rustup toolchain install nightly-2024-09-21-x86_64-unknown-linux-gnu && rustup component add clippy --toolchain nightly-2024-09-21-x86_64-unknown-linux-gnu && rustup component add rustfmt --toolchain nightly-2024-09-21-x86_64-unknown-linux-gnu
       - name: Install nightly
         run: rustup toolchain install nightly-2024-08-01-x86_64-unknown-linux-gnu
       - name: Install std source
@@ -171,8 +166,8 @@ jobs:
           path: |
             ~/pilcom/node_modules
           key: ${{ runner.os }}-pilcom-node-modules
-      - name: Install Rust toolchain nightly-2024-12-17(with clippy and rustfmt)
-        run: rustup toolchain install nightly-2024-12-17-x86_64-unknown-linux-gnu && rustup component add clippy --toolchain nightly-2024-12-17-x86_64-unknown-linux-gnu && rustup component add rustfmt --toolchain nightly-2024-12-17-x86_64-unknown-linux-gnu
+      - name: Install Rust toolchain nightly-2024-09-21(with clippy and rustfmt)
+        run: rustup toolchain install nightly-2024-09-21-x86_64-unknown-linux-gnu && rustup component add clippy --toolchain nightly-2024-09-21-x86_64-unknown-linux-gnu && rustup component add rustfmt --toolchain nightly-2024-09-21-x86_64-unknown-linux-gnu
       - name: Install nightly-2024-08-01
         run: rustup toolchain install nightly-2024-08-01-x86_64-unknown-linux-gnu
       - name: Install std source
@@ -221,8 +216,8 @@ jobs:
           path: |
             ~/pilcom/node_modules
           key: ${{ runner.os }}-pilcom-node-modules
-      - name: Install Rust toolchain nightly-2024-12-17 (with clippy and rustfmt)
-        run: rustup toolchain install nightly-2024-12-17-x86_64-unknown-linux-gnu && rustup component add clippy --toolchain nightly-2024-12-17-x86_64-unknown-linux-gnu && rustup component add rustfmt --toolchain nightly-2024-12-17-x86_64-unknown-linux-gnu
+      - name: Install Rust toolchain nightly-2024-09-21 (with clippy and rustfmt)
+        run: rustup toolchain install nightly-2024-09-21-x86_64-unknown-linux-gnu && rustup component add clippy --toolchain nightly-2024-09-21-x86_64-unknown-linux-gnu && rustup component add rustfmt --toolchain nightly-2024-09-21-x86_64-unknown-linux-gnu
       - name: Install test dependencies
         run: sudo apt-get update && sudo apt-get install -y binutils-riscv64-unknown-elf lld
       - name: Install nightly-2024-08-01