From b8a8dbf886aa3841d79088786f9b36c24fcbf817 Mon Sep 17 00:00:00 2001
From: 0xpantera <0xpantera@proton.me>
Date: Wed, 4 Feb 2026 11:16:22 +0100
Subject: [PATCH 1/3] ci: locate bbup in standard install paths

---
 .github/workflows/ci.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 66e4d5f..a841185 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -62,8 +62,16 @@ jobs:
         run: |
           curl -L https://raw.githubusercontent.com/AztecProtocol/aztec-packages/refs/heads/master/barretenberg/bbup/install | bash
           export PATH="$HOME/.bb/bin:$HOME/.local/bin:$PATH"
-          "$HOME/.bb/bin/bbup"
+          if [ -x "$HOME/.bb/bin/bbup" ]; then
+            "$HOME/.bb/bin/bbup"
+          elif [ -x "$HOME/.local/bin/bbup" ]; then
+            "$HOME/.local/bin/bbup"
+          else
+            echo "bbup not found after install" >&2
+            exit 1
+          fi
           echo "$HOME/.bb/bin" >> $GITHUB_PATH
+          echo "$HOME/.local/bin" >> $GITHUB_PATH
 
       # -- Step 9: Run the test suite
       - name: cargo test

From 245fbc55239cf1079dd1df8ee0c47fcb17af8eeb Mon Sep 17 00:00:00 2001
From: 0xpantera <0xpantera@proton.me>
Date: Wed, 4 Feb 2026 11:24:09 +0100
Subject: [PATCH 2/3] ci: install bbup from aztec next branch

---
 .github/workflows/ci.yml | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a841185..f4e8014 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -60,18 +60,10 @@ jobs:
       # -- Step 8: Install bb for proof generation
       - name: Install bb
         run: |
-          curl -L https://raw.githubusercontent.com/AztecProtocol/aztec-packages/refs/heads/master/barretenberg/bbup/install | bash
-          export PATH="$HOME/.bb/bin:$HOME/.local/bin:$PATH"
-          if [ -x "$HOME/.bb/bin/bbup" ]; then
-            "$HOME/.bb/bin/bbup"
-          elif [ -x "$HOME/.local/bin/bbup" ]; then
-            "$HOME/.local/bin/bbup"
-          else
-            echo "bbup not found after install" >&2
-            exit 1
-          fi
-          echo "$HOME/.bb/bin" >> $GITHUB_PATH
-          echo "$HOME/.local/bin" >> $GITHUB_PATH
+          curl -L https://raw.githubusercontent.com/AztecProtocol/aztec-packages/refs/heads/next/barretenberg/bbup/install | bash
+          export PATH="$HOME/.bb:$PATH"
+          "$HOME/.bb/bbup"
+          echo "$HOME/.bb" >> $GITHUB_PATH
 
       # -- Step 9: Run the test suite
       - name: cargo test

From f4d0aca687b27fde90e254f2d1f0faa2ae4b6550 Mon Sep 17 00:00:00 2001
From: 0xpantera <0xpantera@proton.me>
Date: Wed, 4 Feb 2026 11:27:27 +0100
Subject: [PATCH 3/3] test: avoid deleting target dir in error_context

---
 tests/error_context.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/error_context.rs b/tests/error_context.rs
index 2dc4a1d..45d2f72 100644
--- a/tests/error_context.rs
+++ b/tests/error_context.rs
@@ -148,7 +148,8 @@ fn test_file_operation_error_context() {
 
     let config = Config {
         verbose: true,
-        dry_run: false, // Will try actual file operations
+        // Avoid deleting the workspace target/ during CI; dry-run is enough here.
+        dry_run: true,
         pkg: Some("nonexistent_package".to_string()),
         quiet: false,
         runner: Arc::new(failing_runner),