From f907659bee1d0298b4575ef45c6daa918c273dbc Mon Sep 17 00:00:00 2001 From: kevaundray Date: Tue, 28 Nov 2023 22:21:38 +0000 Subject: [PATCH 1/7] try splitting github workflow into intel and arm --- .github/workflows/publish-bb.yml | 51 ++++++++++++++++++++++---------- 1 file changed, 36 insertions(+), 15 deletions(-) diff --git a/.github/workflows/publish-bb.yml b/.github/workflows/publish-bb.yml index 85c07413176..1cf46c49520 100644 --- a/.github/workflows/publish-bb.yml +++ b/.github/workflows/publish-bb.yml @@ -139,12 +139,9 @@ jobs: ./barretenberg/cpp/build-wasm/bin/barretenberg.wasm.tar.gz ./barretenberg/cpp/build-wasm/bin/acvm_backend.wasm.tar.gz - build-mac: - name: Build on Mac (${{ matrix.target }}) - runs-on: macos-13 - strategy: - matrix: - target: [x86_64-apple-darwin, aarch64-apple-darwin] + build-mac-intel: + name: Build on Mac x86_64-apple-darwin + runs-on: macos-13-large steps: - name: Checkout uses: actions/checkout@v3 @@ -154,18 +151,42 @@ jobs: - name: Create Mac Build Environment run: brew install cmake ninja - - name: Compile Barretenberg (x86_64) - if: matrix.target == 'x86_64-apple-darwin' + - name: Compile Barretenberg working-directory: barretenberg/cpp run: | cmake --preset default -DCMAKE_BUILD_TYPE=RelWithAssert cmake --build --preset default --target bb - - name: Compile Barretenberg (ARM) - if: matrix.target == 'aarch64-apple-darwin' + - name: Package barretenberg artifact + working-directory: barretenberg/cpp/build/bin + run: | + mkdir dist + cp ./bb ./dist/bb + 7z a -ttar -so -an ./dist/* | 7z a -si ./barretenberg-x86_64-apple-darwin.tar.gz + + - name: Upload artifact + uses: actions/upload-artifact@v3 + with: + name: barretenberg-x86_64-apple-darwin + path: ./barretenberg/cpp/build/bin/barretenberg-x86_64-apple-darwin.tar.gz + retention-days: 3 + + build-mac-m1: + name: Build on Mac aarch64-apple-darwin + runs-on: macos-13-xlarge + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + ref: ${{ inputs.tag || env.GITHUB_REF }} + + - name: Create Mac Build Environment + run: brew install cmake ninja + + - name: Compile Barretenberg working-directory: barretenberg/cpp run: | - cmake --toolchain ./cmake/toolchains/aarch64-darwin.cmake --preset default -DCMAKE_BUILD_TYPE=RelWithAssert + cmake --preset default -DCMAKE_BUILD_TYPE=RelWithAssert cmake --build --preset default --target bb - name: Package barretenberg artifact @@ -173,18 +194,18 @@ jobs: run: | mkdir dist cp ./bb ./dist/bb - 7z a -ttar -so -an ./dist/* | 7z a -si ./barretenberg-${{ matrix.target }}.tar.gz + 7z a -ttar -so -an ./dist/* | 7z a -si ./barretenberg-aarch64-apple-darwin.tar.gz - name: Upload artifact uses: actions/upload-artifact@v3 with: - name: barretenberg-${{ matrix.target }} - path: ./barretenberg/cpp/build/bin/barretenberg-${{ matrix.target }}.tar.gz + name: barretenberg-aarch64-apple-darwin + path: ./barretenberg/cpp/build/bin/barretenberg-aarch64-apple-darwin.tar.gz retention-days: 3 release: name: Publish - needs: [build-x86_64-linux-gnu, build-mac, build-wasm-ts] + needs: [build-x86_64-linux-gnu, build-mac-intel, build-mac-m1,build-wasm-ts] runs-on: ubuntu-latest steps: - name: Download files from Linux Runner From 08288e0b79025432dfa2b687eaf4a2cb1c823a7e Mon Sep 17 00:00:00 2001 From: kevaundray Date: Tue, 28 Nov 2023 22:25:59 +0000 Subject: [PATCH 2/7] downgrade intel --- .github/workflows/publish-bb.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-bb.yml b/.github/workflows/publish-bb.yml index 1cf46c49520..0e36bc1ece4 100644 --- a/.github/workflows/publish-bb.yml +++ b/.github/workflows/publish-bb.yml @@ -141,7 +141,7 @@ jobs: build-mac-intel: name: Build on Mac x86_64-apple-darwin - runs-on: macos-13-large + runs-on: macos-13 steps: - name: Checkout uses: actions/checkout@v3 From c9e65d4273ffd75ec7d895ca6e332f1c8b6f9e83 Mon Sep 17 00:00:00 2001 From: kevaundray Date: Tue, 28 Nov 2023 22:41:49 +0000 Subject: [PATCH 3/7] revert back and ask someone to enable large mac runners --- .github/workflows/publish-bb.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-bb.yml b/.github/workflows/publish-bb.yml index 0e36bc1ece4..1cf46c49520 100644 --- a/.github/workflows/publish-bb.yml +++ b/.github/workflows/publish-bb.yml @@ -141,7 +141,7 @@ jobs: build-mac-intel: name: Build on Mac x86_64-apple-darwin - runs-on: macos-13 + runs-on: macos-13-large steps: - name: Checkout uses: actions/checkout@v3 From acbf1157fc68e788d5bcb64ffa1e88e80a1cf9a6 Mon Sep 17 00:00:00 2001 From: kevaundray Date: Tue, 30 Jan 2024 15:48:23 +0000 Subject: [PATCH 4/7] Update .github/workflows/publish-bb.yml --- .github/workflows/publish-bb.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-bb.yml b/.github/workflows/publish-bb.yml index ffd5f03217a..d407e2412b8 100644 --- a/.github/workflows/publish-bb.yml +++ b/.github/workflows/publish-bb.yml @@ -141,7 +141,7 @@ jobs: build-mac-intel: name: Build on Mac x86_64-apple-darwin - runs-on: macos-13-large + runs-on: macos-13-xlarge steps: - name: Checkout uses: actions/checkout@v3 From 3735afce68dc9e276208a2a898c83a0d584b4ae5 Mon Sep 17 00:00:00 2001 From: kevaundray Date: Tue, 30 Jan 2024 15:49:09 +0000 Subject: [PATCH 5/7] Update .github/workflows/publish-bb.yml --- .github/workflows/publish-bb.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-bb.yml b/.github/workflows/publish-bb.yml index d407e2412b8..c674901dc99 100644 --- a/.github/workflows/publish-bb.yml +++ b/.github/workflows/publish-bb.yml @@ -141,7 +141,7 @@ jobs: build-mac-intel: name: Build on Mac x86_64-apple-darwin - runs-on: macos-13-xlarge + runs-on: macos-13 steps: - name: Checkout uses: actions/checkout@v3 From 08cc8c58b5a85c75274a5c00ccc7e6b677981129 Mon Sep 17 00:00:00 2001 From: kevaundray Date: Tue, 30 Jan 2024 22:36:39 +0000 Subject: [PATCH 6/7] Update .github/workflows/publish-bb.yml --- .github/workflows/publish-bb.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-bb.yml b/.github/workflows/publish-bb.yml index c674901dc99..31297ccf022 100644 --- a/.github/workflows/publish-bb.yml +++ b/.github/workflows/publish-bb.yml @@ -173,7 +173,7 @@ jobs: build-mac-m1: name: Build on Mac aarch64-apple-darwin - runs-on: macos-13-xlarge + runs-on: macos-14 steps: - name: Checkout uses: actions/checkout@v3 From 2eee2bfd0f8155fd877e7fc4e6dd99d5d462eb2d Mon Sep 17 00:00:00 2001 From: kevaundray Date: Wed, 31 Jan 2024 00:42:46 +0000 Subject: [PATCH 7/7] Update .github/workflows/publish-bb.yml --- .github/workflows/publish-bb.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-bb.yml b/.github/workflows/publish-bb.yml index 31297ccf022..6793f999745 100644 --- a/.github/workflows/publish-bb.yml +++ b/.github/workflows/publish-bb.yml @@ -172,7 +172,7 @@ jobs: retention-days: 3 build-mac-m1: - name: Build on Mac aarch64-apple-darwin + name: Build on Mac aarch64-apple-darwin runs-on: macos-14 steps: - name: Checkout