diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-11-17 07:00:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-11-17 07:00:12 -0800 |
| commit | 7f79dc3562bad79a6452e3f350206191f4b95923 (patch) | |
| tree | 1f3601f22e9b89d0f5c3d4941123d050f3988fc2 | |
| parent | c93f1a0fa3eb0a943f4cc2262de1832c9a3aa1e2 (diff) | |
| parent | ffff0bb0dac1f1b5e559ab61ca55616dda1e87c6 (diff) | |
| download | git-7f79dc3562bad79a6452e3f350206191f4b95923.tar.gz | |
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
| -rwxr-xr-x | ci/install-dependencies.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index 50628ee2dd..6ee8216a05 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -109,7 +109,7 @@ macos-*) brew link --force gettext mkdir -p "$CUSTOM_PATH" - wget -q "$P4WHENCE/bin.macosx1015x86_64/helix-core-server.tgz" && + wget -q "$P4WHENCE/bin.macosx12arm64/helix-core-server.tgz" && tar -xf helix-core-server.tgz -C "$CUSTOM_PATH" p4 p4d && sudo xattr -d com.apple.quarantine "$CUSTOM_PATH/p4" "$CUSTOM_PATH/p4d" 2>/dev/null || true rm helix-core-server.tgz |