From 5c77c4f63b2d69c5e28feade2056facafe859e03 Mon Sep 17 00:00:00 2001
From: ludamad <adam.domurad@gmail.com>
Date: Mon, 7 Oct 2024 22:44:18 +0100
Subject: [PATCH] fix: circleci (#9056)

---
 .github/workflows/ci.yml                          | 4 ++--
 noir-projects/Dockerfile                          | 4 +++-
 noir-projects/noir-protocol-circuits/bootstrap.sh | 3 +--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ed39596f0ce..eb816c42c2b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -474,7 +474,7 @@ jobs:
         run: earthly-ci --no-output ./noir+packages-test
 
   noir-projects:
-    needs: [build, changes, build]
+    needs: [build, changes]
     runs-on: ${{ github.event.pull_request.user.login || github.actor }}-x86
     if: needs.changes.outputs.barretenberg == 'true' || needs.changes.outputs.noir == 'true' || needs.changes.outputs.noir-projects == 'true' || needs.changes.outputs.txe == 'true'
     steps:
@@ -486,7 +486,7 @@ jobs:
       - name: "Noir Projects"
         timeout-minutes: 40
         run: |
-          earthly-ci --no-output ./noir-projects/+test
+          earthly-ci --no-output ./noir-projects/+test --RAYON_NUM_THREADS=$(nproc)
 
   avm-format:
     needs: [build, changes]
diff --git a/noir-projects/Dockerfile b/noir-projects/Dockerfile
index cb21a086047..7aca16982f2 100644
--- a/noir-projects/Dockerfile
+++ b/noir-projects/Dockerfile
@@ -18,6 +18,8 @@ WORKDIR /usr/src/noir-projects
 COPY . .
 # Build
 RUN yarn
+# Override RAYON_NUM_THREADS default
+ENV RAYON_NUM_THREADS=32
 WORKDIR /usr/src/noir-projects/noir-contracts
 RUN ./bootstrap.sh
 WORKDIR /usr/src/noir-projects/noir-protocol-circuits
@@ -28,4 +30,4 @@ WORKDIR /usr/src/noir-projects/aztec-nr
 RUN nargo compile --silence-warnings
 
 FROM scratch
-COPY --from=builder /usr/src/noir-projects /usr/src/noir-projects
\ No newline at end of file
+COPY --from=builder /usr/src/noir-projects /usr/src/noir-projects
diff --git a/noir-projects/noir-protocol-circuits/bootstrap.sh b/noir-projects/noir-protocol-circuits/bootstrap.sh
index 777c04d8e98..6ac4075d482 100755
--- a/noir-projects/noir-protocol-circuits/bootstrap.sh
+++ b/noir-projects/noir-protocol-circuits/bootstrap.sh
@@ -20,7 +20,7 @@ node ./scripts/generate_variants.js
 
 echo "Compiling protocol circuits..."
 NARGO=${NARGO:-../../noir/noir-repo/target/release/nargo}
-RAYON_NUM_THREADS=1 $NARGO compile --silence-warnings
+RAYON_NUM_THREADS=${RAYON_NUM_THREADS:-1} $NARGO compile --silence-warnings
 
 BB_HASH=${BB_HASH:-$(cd ../../ && git ls-tree -r HEAD | grep 'barretenberg/cpp' | awk '{print $3}' | git hash-object --stdin)}
 echo Using BB hash $BB_HASH
@@ -60,4 +60,3 @@ else
   done
 
 fi
-