Skip to content

Commit 7b365d7

Browse files
authored
Merge pull request #627 from zeromq/ci-fixes
2 parents 44e061b + 782929d commit 7b365d7

File tree

2 files changed

+3
-13
lines changed

2 files changed

+3
-13
lines changed

.github/workflows/CI.yml

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ jobs:
5353
cpp_arch: x64
5454
zmq_draft: false
5555

56-
- os: macos-13
56+
- os: macos-14
5757
node_version: 18
58-
node_arch: x64
58+
node_arch: arm64
5959
ARCH: arm64
6060
cpp_arch: amd64_arm64
6161
zmq_draft: false
@@ -174,13 +174,3 @@ jobs:
174174
pnpm install -g electron@latest
175175
xvfb-run --auto-servernum pnpm run test.electron.main
176176
continue-on-error: true
177-
178-
- name: Tests + GC Tests (Release)
179-
if: ${{ !matrix.docker }}
180-
uses: nick-fields/retry@v3
181-
with:
182-
timeout_minutes: 5
183-
max_attempts: 1
184-
command: |
185-
pnpm run test
186-
continue-on-error: true

script/macos-arm-deps.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -e
44
#! Install arm-brew on x86 MacOS Arm
55
#! Based on https://github.com/Homebrew/discussions/discussions/2843#discussioncomment-2243610
66

7-
bottle_tag="arm64_big_sur" # Macos 11 is big sure
7+
bottle_tag="arm64_sonoma" # Macos 14
88
dependencies="libsodium"
99

1010
mkdir -p ~/arm-target/bin

0 commit comments

Comments
 (0)