From ec34537326756f527157cb8f6a9d8dc888d1e576 Mon Sep 17 00:00:00 2001
From: Alejandro Cabeza Romero <alex93cabeza@gmail.com>
Date: Wed, 13 May 2026 21:43:05 +0200
Subject: [PATCH] Merge test into the CI pipeline for simplicity's sake.

---
 .../workflows/{build-circuits.yml => ci.yml}  | 52 ++++++++++++++++++-
 .github/workflows/test.yml                    | 36 -------------
 2 files changed, 51 insertions(+), 37 deletions(-)
 rename .github/workflows/{build-circuits.yml => ci.yml} (96%)
 delete mode 100644 .github/workflows/test.yml

diff --git a/.github/workflows/build-circuits.yml b/.github/workflows/ci.yml
similarity index 96%
rename from .github/workflows/build-circuits.yml
rename to .github/workflows/ci.yml
index c9b9e41..0c777e8 100644
--- a/.github/workflows/build-circuits.yml
+++ b/.github/workflows/ci.yml
@@ -1,4 +1,4 @@
-name: Build Circuits
+name: CI
 
 on:
   push:
@@ -1109,6 +1109,55 @@ jobs:
           name: logos-blockchain-circuits-${{ env.VERSION }}-${{ env.OS }}-${{ env.ARCH }}.tar.gz
           path: logos-blockchain-circuits-${{ env.VERSION }}-${{ env.OS }}-${{ env.ARCH }}.tar.gz
 
+  test:
+    name: Test
+    runs-on: ubuntu-latest
+    needs:
+      - setup
+      - build-linux
+    env:
+      VERSION: ${{ needs.setup.outputs.version }}
+      OS: linux
+      ARCH: x86_64
+    steps:
+      - name: Checkout
+        uses: actions/checkout@8edcb1bdb4e267140fa742c62e395cd74f332709
+
+      - name: Install Rust Toolchain
+        uses: actions-rs/toolchain@88dc2356392166efad76775c878094f4e83ff746  # Version 1.0.6
+
+      - name: Cache Cargo artifacts
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # Version 4.2.3
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            rust/target
+          key: ${{ runner.os }}-cargo-${{ hashFiles('rust/Cargo.lock', 'rust/Cargo.toml') }}
+          restore-keys: |
+            ${{ runner.os }}-cargo-
+
+      - name: Download Linux Bundle
+        uses: actions/download-artifact@448e3f862ab3ef47aa50ff917776823c9946035b
+        with:
+          name: logos-blockchain-circuits-${{ env.VERSION }}-${{ env.OS }}-${{ env.ARCH }}.tar.gz
+          path: circuit-libs/
+
+      - name: Extract Bundle
+        run: tar -xzf circuit-libs/logos-blockchain-circuits-${{ env.VERSION }}-${{ env.OS }}-${{ env.ARCH }}.tar.gz -C circuit-libs/
+
+      - name: Test
+        run: >
+          cargo test
+          --manifest-path rust/Cargo.toml
+          --all
+          --all-features
+        env:
+          LBC_POC_LIB_DIR: ${{ github.workspace }}/circuit-libs/logos-blockchain-circuits-${{ env.VERSION }}-${{ env.OS }}-${{ env.ARCH }}/poc
+          LBC_POL_LIB_DIR: ${{ github.workspace }}/circuit-libs/logos-blockchain-circuits-${{ env.VERSION }}-${{ env.OS }}-${{ env.ARCH }}/pol
+          LBC_POQ_LIB_DIR: ${{ github.workspace }}/circuit-libs/logos-blockchain-circuits-${{ env.VERSION }}-${{ env.OS }}-${{ env.ARCH }}/poq
+          LBC_SIGNATURE_LIB_DIR: ${{ github.workspace }}/circuit-libs/logos-blockchain-circuits-${{ env.VERSION }}-${{ env.OS }}-${{ env.ARCH }}/signature
+
   publish-release:
     name: Create Release
     runs-on: ubuntu-latest
@@ -1121,6 +1170,7 @@ jobs:
       - build-linux-aarch64
       - build-windows
       - build-macos
+      - test
     env:
       TAG: ${{ needs.setup.outputs.tag }}
       VERSION: ${{ needs.setup.outputs.version }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
deleted file mode 100644
index fc95c94..0000000
--- a/.github/workflows/test.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: Test
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-
-jobs:
-  test:
-    name: Test
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2  # Version 4.2.2
-
-      - name: Install Rust Toolchain
-        uses: actions-rust-lang/setup-rust-toolchain@2b1f5e9b395427c92ee4e3331786ca3c37afe2d7  # Version 1.16.0
-
-      - name: Cache Cargo artifacts
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # Version 4.2.3
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            rust/target
-          key: ${{ runner.os }}-cargo-${{ hashFiles('rust/Cargo.lock', 'rust/Cargo.toml') }}
-          restore-keys: |
-            ${{ runner.os }}-cargo-
-
-      - name: Test
-        run: >
-          cargo test
-          --manifest-path rust/Cargo.toml
-          --all
-          --all-features