Merge branch 'main' into tasks_db

.github/workflows/ci-all.yml

@@ -12,6 +12,8 @@ on:
       - "host/**"
       - "lib/**"
       - "script/**"
+  merge_group:
+
 env:
   CARGO_TERM_COLOR: always
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/ci-lint.yml

@@ -3,6 +3,7 @@ name: CI - Lint
 on:
   pull_request:
     types: [opened, reopened, edited, synchronize]
+  merge_group:
 
 env:
   CARGO_TERM_COLOR: always

.github/workflows/ci-provers.yml

@@ -11,6 +11,8 @@ on:
     paths:
       - "pipelines/**"
       - "harness/**"
+  merge_group:
+
 env:
   CARGO_TERM_COLOR: always
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/ci-risc0.yml

@@ -9,11 +9,14 @@ on:
   pull_request:
     paths:
       - "provers/risc0/**"
+  merge_group:
 
+
+==== BASE ====
 jobs:
-  build-test-risc0:
-    name: Build and test risc0
-    uses: ./.github/workflows/ci-build-test-reusable.yml
-    with:
-      version_name: "risc0"
-      version_toolchain: "stable"
+    build-test-risc0:
+      name: Build and test risc0
+      uses: ./.github/workflows/ci-build-test-reusable.yml
+      with:
+        version_name: "risc0"
+        version_toolchain: "stable"

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

@@ -9,19 +9,20 @@ on:
   pull_request:
     paths:
       - "provers/sgx/**"
+  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
+    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
+    build-test-sgx-hardware:
+      name: Build and test sgx in hardware
+      uses: ./.github/workflows/ci-sgx-hardware.yml

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

@@ -9,6 +9,7 @@ on:
   pull_request:
     paths:
       - "docker/**"
+  merge_group:
 
 jobs:
   build-test-sgx-with-docker:

.github/workflows/ci-sp1.yml

@@ -9,6 +9,7 @@ on:
   pull_request:
     paths:
       - "provers/sp1/**"
+  merge_group:
 
 jobs:
   build-test-sgx:

.github/workflows/openapi-deploy.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches: ["main"]
   pull_request:
+  merge_group:
 
 permissions:
   contents: read