Skip to content

Commit 7f79dc3

Browse files
committed
Merge branch 'jc/ci-use-arm64-p4-on-macos'
We replaced deprecated macos-13 with macos-14 image in GitHub Actions CI, but we forgot that the image is for arm64. We have been seeing a lot of test failures ever since. Switch to arm64 binary for Perforce tests. * jc/ci-use-arm64-p4-on-macos: Use Perforce arm64 binary on macOS CI jobs
2 parents c93f1a0 + ffff0bb commit 7f79dc3

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

ci/install-dependencies.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ macos-*)
109109
brew link --force gettext
110110

111111
mkdir -p "$CUSTOM_PATH"
112-
wget -q "$P4WHENCE/bin.macosx1015x86_64/helix-core-server.tgz" &&
112+
wget -q "$P4WHENCE/bin.macosx12arm64/helix-core-server.tgz" &&
113113
tar -xf helix-core-server.tgz -C "$CUSTOM_PATH" p4 p4d &&
114114
sudo xattr -d com.apple.quarantine "$CUSTOM_PATH/p4" "$CUSTOM_PATH/p4d" 2>/dev/null || true
115115
rm helix-core-server.tgz

0 commit comments

Comments
 (0)