ci: check Eth LC compiles and use matrix job (#126)

* ci: check Eth LC compiles and use matrix job * fix: Update curve25519-dalek patch branch --------- Co-authored-by: wwared <[email protected]>
argumentcomputer · Aug 4, 2024 · a64190f · a64190f
1 parent 9960839
commit a64190f
Show file tree

Hide file tree

Showing 5 changed files with 98 additions and 69 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -70,6 +70,7 @@ jobs:
           GIT_COMMIT: ${{ github.sha }}
           WORKFLOW_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
         with:
+          update_existing: true
           filename: .github/templates/NIGHTLY_TESTS.md
 
   prove:
@@ -112,4 +113,5 @@ jobs:
           GIT_COMMIT: ${{ github.sha }}
           WORKFLOW_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
         with:
+          update_existing: true
           filename: .github/templates/NIGHTLY_TESTS.md
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -159,71 +159,48 @@ jobs:
         with:
           filename: .github/templates/M1_MAC.md
 
-  check-aptos-lc-compiles:
+  check-downstream-compiles:
     runs-on: warp-ubuntu-latest-x64-16x
+    strategy:
+      matrix:
+        include:
+          - repo: zk-light-clients
+            path: aptos
+          - repo: zk-light-clients
+            path: ethereum
+          - repo: loam
+            path: ""
     steps:
       - uses: actions/checkout@v4
         with:
           repository: lurk-lab/ci-workflows
           path: ci-workflows
       - uses: ./ci-workflows/.github/actions/ci-env
-      - name: Set env
-        run: |
-          echo "DOWNSTREAM_REPO=zk-light-clients" | tee -a $GITHUB_ENV
-          echo "UPSTREAM_REPO=sphinx" | tee -a $GITHUB_ENV
       - uses: actions/checkout@v4
         with:
-          path: ${{ github.workspace }}/${{ env.UPSTREAM_REPO }}
+          path: ${{ github.workspace }}/sphinx
       - name: Setup CI
         uses: ./sphinx/.github/actions/setup
         with:
           pull_token: ${{ secrets.REPO_TOKEN }}
           perf: false
       - name: Install deps
         run: |
-          sudo apt-get update && sudo apt-get install -y build-essential pkg-config libssl-dev libudev-dev cmake
-          cd sphinx/cli
-          cargo install --locked --force --path .
-          cargo prove install-toolchain   
-          echo "RUSTFLAGS=${{env.RUSTFLAGS}} --cfg tokio_unstable" | tee -a $GITHUB_ENV
+          if [[ "${{ matrix.downstream-path }}" == "aptos" || "${{ matrix.downstream-path }}" == "ethereum" ]]; then
+            sudo apt-get update && sudo apt-get install -y build-essential pkg-config libssl-dev libudev-dev cmake
+            cd sphinx/cli
+            cargo install --locked --force --path .
+            cargo prove install-toolchain
+            echo "RUSTFLAGS=${{env.RUSTFLAGS}} --cfg tokio_unstable" | tee -a $GITHUB_ENV
+          fi
       - uses: actions/checkout@v4
         with:
-          repository: "lurk-lab/${{ env.DOWNSTREAM_REPO }}"
-          path: ${{ github.workspace }}/${{ env.DOWNSTREAM_REPO }}
+          repository: lurk-lab/${{ matrix.repo }}
+          path: ${{ github.workspace }}/${{ matrix.repo }}
           token: ${{ secrets.REPO_TOKEN }}
       - uses: ./ci-workflows/.github/actions/check-downstream-compiles
         with:
-          upstream-path: "${{ env.UPSTREAM_REPO }}"
-          downstream-path: "${{ env.DOWNSTREAM_REPO }}/aptos"
+          upstream-path: "sphinx"
+          downstream-path: "${{ matrix.repo }}/${{ matrix.path }}"
           patch-ssh: true
 
-  check-loam-compiles:
-    runs-on: warp-ubuntu-latest-x64-16x
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          repository: lurk-lab/ci-workflows
-          path: ci-workflows
-      - uses: ./ci-workflows/.github/actions/ci-env
-      - name: Set env
-        run: |
-          echo "DOWNSTREAM_REPO=loam" | tee -a $GITHUB_ENV
-          echo "UPSTREAM_REPO=sphinx" | tee -a $GITHUB_ENV
-      - uses: actions/checkout@v4
-        with:
-          path: ${{ github.workspace }}/${{ env.UPSTREAM_REPO }}
-      - name: Setup CI
-        uses: ./sphinx/.github/actions/setup
-        with:
-          pull_token: ${{ secrets.REPO_TOKEN }}
-          perf: false
-      - uses: actions/checkout@v4
-        with:
-          repository: "lurk-lab/${{ env.DOWNSTREAM_REPO }}"
-          path: ${{ github.workspace }}/${{ env.DOWNSTREAM_REPO }}
-          token: ${{ secrets.REPO_TOKEN }}
-      - uses: ./ci-workflows/.github/actions/check-downstream-compiles
-        with:
-          upstream-path: "${{ env.UPSTREAM_REPO }}"
-          downstream-path: "${{ env.DOWNSTREAM_REPO }}"
-          patch-ssh: true
diff --git a/tests/ed25519/Cargo.lock b/tests/ed25519/Cargo.lock
diff --git a/tests/ed25519/Cargo.toml b/tests/ed25519/Cargo.toml
@@ -6,5 +6,5 @@ edition = "2021"
 
 [dependencies]
 sphinx-zkvm = { path = "../../zkvm/entrypoint" }
-ed25519-dalek = { git = "https://github.com/sp1-patches/curve25519-dalek", branch = "patch-v4.1.1" }
+ed25519-dalek = { git = "https://github.com/sp1-patches/curve25519-dalek", branch = "patch-curve25519-v4.1.1" }
 hex-literal = "0.4.1"
diff --git a/tests/ed25519/elf/riscv32im-succinct-zkvm-elf b/tests/ed25519/elf/riscv32im-succinct-zkvm-elf