Skip to content

Commit ca5b6f8

Browse files
kevaundrayludamad
andauthored
chore: Switch to macos-14 for m1 runners (#3456)
Please provide a paragraph or two giving a summary of the change, including relevant motivation and context. # Checklist: Remove the checklist to signal you've completed it. Enable auto-merge if the PR is ready to merge. - [ ] If the pull request requires a cryptography review (e.g. cryptographic algorithm implementations) I have added the 'crypto' tag. - [ ] I have reviewed my diff in github, line by line and removed unexpected formatting changes, testing logs, or commented-out code. - [ ] Every change is related to the PR description. - [ ] I have [linked](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue) this pull request to relevant issues (if any exist). --------- Co-authored-by: ludamad <adam.domurad@gmail.com>
1 parent 26a0d49 commit ca5b6f8

File tree

1 file changed

+35
-14
lines changed

1 file changed

+35
-14
lines changed

.github/workflows/publish-bb.yml

+35-14
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,9 @@ jobs:
139139
./barretenberg/cpp/build-wasm/bin/barretenberg.wasm.tar.gz
140140
./barretenberg/cpp/build-wasm/bin/acvm_backend.wasm.tar.gz
141141
142-
build-mac:
143-
name: Build on Mac (${{ matrix.target }})
142+
build-mac-intel:
143+
name: Build on Mac x86_64-apple-darwin
144144
runs-on: macos-13
145-
strategy:
146-
matrix:
147-
target: [x86_64-apple-darwin, aarch64-apple-darwin]
148145
steps:
149146
- name: Checkout
150147
uses: actions/checkout@v3
@@ -154,37 +151,61 @@ jobs:
154151
- name: Create Mac Build Environment
155152
run: brew install cmake ninja
156153

157-
- name: Compile Barretenberg (x86_64)
158-
if: matrix.target == 'x86_64-apple-darwin'
154+
- name: Compile Barretenberg
159155
working-directory: barretenberg/cpp
160156
run: |
161157
cmake --preset default -DCMAKE_BUILD_TYPE=RelWithAssert
162158
cmake --build --preset default --target bb
163159
164-
- name: Compile Barretenberg (ARM)
165-
if: matrix.target == 'aarch64-apple-darwin'
160+
- name: Package barretenberg artifact
161+
working-directory: barretenberg/cpp/build/bin
162+
run: |
163+
mkdir dist
164+
cp ./bb ./dist/bb
165+
7z a -ttar -so -an ./dist/* | 7z a -si ./barretenberg-x86_64-apple-darwin.tar.gz
166+
167+
- name: Upload artifact
168+
uses: actions/upload-artifact@v3
169+
with:
170+
name: barretenberg-x86_64-apple-darwin
171+
path: ./barretenberg/cpp/build/bin/barretenberg-x86_64-apple-darwin.tar.gz
172+
retention-days: 3
173+
174+
build-mac-m1:
175+
name: Build on Mac aarch64-apple-darwin
176+
runs-on: macos-14
177+
steps:
178+
- name: Checkout
179+
uses: actions/checkout@v3
180+
with:
181+
ref: ${{ inputs.tag || env.GITHUB_REF }}
182+
183+
- name: Create Mac Build Environment
184+
run: brew install cmake ninja
185+
186+
- name: Compile Barretenberg
166187
working-directory: barretenberg/cpp
167188
run: |
168-
cmake --toolchain ./cmake/toolchains/aarch64-darwin.cmake --preset default -DCMAKE_BUILD_TYPE=RelWithAssert
189+
cmake --preset default -DCMAKE_BUILD_TYPE=RelWithAssert
169190
cmake --build --preset default --target bb
170191
171192
- name: Package barretenberg artifact
172193
working-directory: barretenberg/cpp/build/bin
173194
run: |
174195
mkdir dist
175196
cp ./bb ./dist/bb
176-
7z a -ttar -so -an ./dist/* | 7z a -si ./barretenberg-${{ matrix.target }}.tar.gz
197+
7z a -ttar -so -an ./dist/* | 7z a -si ./barretenberg-aarch64-apple-darwin.tar.gz
177198
178199
- name: Upload artifact
179200
uses: actions/upload-artifact@v3
180201
with:
181-
name: barretenberg-${{ matrix.target }}
182-
path: ./barretenberg/cpp/build/bin/barretenberg-${{ matrix.target }}.tar.gz
202+
name: barretenberg-aarch64-apple-darwin
203+
path: ./barretenberg/cpp/build/bin/barretenberg-aarch64-apple-darwin.tar.gz
183204
retention-days: 3
184205

185206
release:
186207
name: Publish
187-
needs: [build-x86_64-linux-gnu, build-mac, build-wasm-ts]
208+
needs: [build-x86_64-linux-gnu, build-mac-intel, build-mac-m1,build-wasm-ts]
188209
runs-on: ubuntu-latest
189210
steps:
190211
- name: Download files from Linux Runner

0 commit comments

Comments
 (0)