Skip to content

Commit b135fbf

Browse files
fix: test-and-deploy mac builds (#1775)
* fix: add in proper mac runs * fix: @v4 * fix: forgot some * fix: add names * fix: update download-artifact * fix: download-artifact names * fix: try node 20 * fix: node 18 * fix: flip it because now arm64 is the norm * fix: build both versions * fix: update to build on node arm64 * fix: only arm64 * fix: make it macos-latest * fix: push everything in for review * fix: small fixes * fix: more small fixes * fix: update the binary name
1 parent 49eed79 commit b135fbf

File tree

4 files changed

+195
-81
lines changed

4 files changed

+195
-81
lines changed

.circleci/config.yml

+11-8
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,16 @@ jobs:
8181
node-version: '18.20.3'
8282
- run: npm install
8383
- run: make test
84-
- run: make build_macos
84+
- run: |
85+
make build_macos_arm64
86+
mkdir -p coverage-macos-arm64
87+
cp -r coverage/* coverage-macos-arm64/
8588
8689
- persist_to_workspace:
8790
root: .
8891
paths:
89-
- out/codecov-macos
90-
- coverage-macos
92+
- out/codecov-macos-arm64
93+
- coverage-macos-arm64
9194

9295
build-alpine:
9396
docker:
@@ -393,15 +396,15 @@ jobs:
393396
- run:
394397
name: Run MacOS binary -f (dry-run)
395398
command: |
396-
./out/codecov-macos -f /Users/distiller/project/coverage/cobertura-coverage.xml -F macos -d -Z -v -e CIRCLE_BRANCH >> output_osx.txt
399+
./out/codecov-macos-arm64 -f /Users/distiller/project/coverage/cobertura-coverage.xml -F macos -d -Z -v -e CIRCLE_BRANCH >> output_osx.txt
397400
- run:
398401
name: Run MacOS binary auto-detect (dry-run)
399402
command: |
400-
./out/codecov-macos -F macos -v -d -Z -e CIRCLE_BRANCH >> output_osx.txt
403+
./out/codecov-macos-arm64 -F macos -v -d -Z -e CIRCLE_BRANCH >> output_osx.txt
401404
- run:
402405
name: Run MacOS binary (upload)
403406
command: |
404-
./out/codecov-macos -F macos -v -Z -e CIRCLE_BRANCH
407+
./out/codecov-macos-arm64 -F macos -v -Z -e CIRCLE_BRANCH
405408
406409
- persist_to_workspace:
407410
root: .
@@ -425,11 +428,11 @@ jobs:
425428
- run:
426429
name: Run MacOS binary (dry-run)
427430
command: |
428-
./out/codecov-macos -F macos-without-git -d > output_osx_without_git.txt
431+
./out/codecov-macos-arm64 -F macos-without-git -d > output_osx_without_git.txt
429432
- run:
430433
name: Run MacOS binary (upload)
431434
command: |
432-
./out/codecov-macos -F macos-without-git
435+
./out/codecov-macos-arm64 -F macos-without-git
433436
434437
- persist_to_workspace:
435438
root: .

0 commit comments

Comments
 (0)