From a7ae0b731ec3e5175461aaadd9d0d0d1c2db12c0 Mon Sep 17 00:00:00 2001
From: Blaine Bublitz <blaine.bublitz@gmail.com>
Date: Fri, 28 Apr 2023 10:17:24 -0700
Subject: [PATCH 1/2] chore(ci): Utilize new workflow to build binaries

---
 .github/workflows/release.yml | 36 +++--------------------------------
 1 file changed, 3 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c7eb6df168e..8409e9e0928 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -58,8 +58,8 @@ jobs:
           git commit -m 'chore: Update lockfile'
           git push
 
-  build-linux-binaries:
-    name: Build linux binaries
+  build-binaries:
+    name: Build binaries
     needs: [release-please]
     if: ${{ needs.release-please.outputs.tag-name }}
     runs-on: ubuntu-latest
@@ -67,37 +67,7 @@ jobs:
       - name: Dispatch to build-nargo
         uses: benc-uk/workflow-dispatch@v1
         with:
-          workflow: publish-linux.yml
-          repo: noir-lang/build-nargo
-          ref: master
-          token: ${{ secrets.NOIR_REPO_TOKEN }}
-          inputs: '{ "noir-ref": "${{ needs.release-please.outputs.tag-name }}" }'
-
-  build-windows-binaries:
-    name: Build windows binaries
-    needs: [release-please]
-    if: ${{ needs.release-please.outputs.tag-name }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Dispatch to build-nargo
-        uses: benc-uk/workflow-dispatch@v1
-        with:
-          workflow: publish-x86_64-pc-windows-wasm.yml
-          repo: noir-lang/build-nargo
-          ref: master
-          token: ${{ secrets.NOIR_REPO_TOKEN }}
-          inputs: '{ "noir-ref": "${{ needs.release-please.outputs.tag-name }}" }'
-
-  build-mac-binaries:
-    name: Build mac binaries
-    needs: [release-please]
-    if: ${{ needs.release-please.outputs.tag-name }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Dispatch to build-nargo
-        uses: benc-uk/workflow-dispatch@v1
-        with:
-          workflow: publish-apple-darwin-wasm.yml
+          workflow: nix-barretenberg.yml
           repo: noir-lang/build-nargo
           ref: master
           token: ${{ secrets.NOIR_REPO_TOKEN }}

From a05c68161c280a3189d7abdd3b1515283666a628 Mon Sep 17 00:00:00 2001
From: Tom French <15848336+TomAFrench@users.noreply.github.com>
Date: Fri, 28 Apr 2023 20:45:00 +0100
Subject: [PATCH 2/2] Update release.yml

---
 .github/workflows/release.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8409e9e0928..f242f10d971 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -67,11 +67,11 @@ jobs:
       - name: Dispatch to build-nargo
         uses: benc-uk/workflow-dispatch@v1
         with:
-          workflow: nix-barretenberg.yml
+          workflow: publish.yml
           repo: noir-lang/build-nargo
           ref: master
           token: ${{ secrets.NOIR_REPO_TOKEN }}
-          inputs: '{ "noir-ref": "${{ needs.release-please.outputs.tag-name }}" }'
+          inputs: '{ "noir-ref": "${{ needs.release-please.outputs.tag-name }}", "publish": true }'
 
   publish-wasm:
     name: Publish noir_wasm package