Merge branch 'main' into release-please--branches--main

.github/workflows/ci-integration-reusable.yml

@@ -0,0 +1,52 @@
+name: CI Integration test - Reusable
+
+on:
+  workflow_call:
+    inputs:
+      version_name:
+        type: string
+        required: true
+      version_toolchain:
+        type: string
+        required: true
+
+env:
+  CI: 1
+  CARGO_TERM_COLOR: always
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+jobs:
+  build-run-integration:
+    name: Build and run integration
+    runs-on: [taiko-runner]
+    timeout-minutes: 120
+
+    env:
+      TARGET: ${{ inputs.version_name }}
+      CI: 1
+      MOCK: 1
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: ${{ inputs.version_toolchain }}
+          profile: minimal
+
+      - name: Setup sccache
+        if: ${{ inputs.version_name }} == risc0
+        uses: risc0/risc0/.github/actions/sccache@release-0.19
+
+      - name: Install ${{ inputs.version_name }}
+        run: make install
+
+      - name: Build ${{ inputs.version_name }} prover
+        run: make build
+
+    #  TODO:(petar) re add to CI after fixing sgx directory setup
+    #
+    #   - name: Run integration test for ${{ inputs.version_name }} prover
+    #     run: make integration

.github/workflows/ci-native.yml

@@ -9,3 +9,10 @@ jobs:
     with:
       version_name: "native"
       version_toolchain: "nightly-2024-04-17"
+
+  integration-test-native:
+    name: Run integration tests on native
+    uses: ./.github/workflows/ci-integration-reusable.yml
+    with:
+      version_name: "native"
+      version_toolchain: "nightly-2024-04-17"

.github/workflows/ci-risc0.yml

@@ -18,3 +18,10 @@ jobs:
     with:
       version_name: "risc0"
       version_toolchain: "stable"
+
+  integration-test-risc0:
+    name: Run integration tests on risc0
+    uses: ./.github/workflows/ci-integration-reusable.yml
+    with:
+      version_name: "risc0"
+      version_toolchain: "nightly-2024-04-17"

.github/workflows/ci-sgx-all.yml

@@ -12,17 +12,24 @@ on:
   merge_group:
 
 jobs:
-    build-test-sgx:
-      name: Build and test sgx
-      uses: ./.github/workflows/ci-build-test-reusable.yml
-      with:
-        version_name: "sgx"
-        version_toolchain: "stable"
+  build-test-sgx:
+    name: Build and test sgx
+    uses: ./.github/workflows/ci-build-test-reusable.yml
+    with:
+      version_name: "sgx"
+      version_toolchain: "stable"
 
-    build-test-sgx-docker:
-      name: Build and test sgx with Docker
-      uses: ./.github/workflows/ci-sgx-docker.yml
+  integration-test-sgx:
+    name: Run integration tests on sgx
+    uses: ./.github/workflows/ci-integration-reusable.yml
+    with:
+      version_name: "sgx"
+      version_toolchain: "nightly-2024-04-17"
 
-    build-test-sgx-hardware:
-      name: Build and test sgx in hardware
-      uses: ./.github/workflows/ci-sgx-hardware.yml
+  build-test-sgx-docker:
+    name: Build and test sgx with Docker
+    uses: ./.github/workflows/ci-sgx-docker.yml
+
+  build-test-sgx-hardware:
+    name: Build and test sgx in hardware
+    uses: ./.github/workflows/ci-sgx-hardware.yml

.github/workflows/ci-sp1.yml

@@ -18,3 +18,10 @@ jobs:
     with:
       version_name: "sp1"
       version_toolchain: "nightly-2024-04-18"
+
+  integration-test-sp1:
+    name: Run integration tests on sp1
+    uses: ./.github/workflows/ci-integration-reusable.yml
+    with:
+      version_name: "sp1"
+      version_toolchain: "nightly-2024-04-17"