]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Use Perforce arm64 binary on macOS CI jobs
authorJunio C Hamano <gitster@pobox.com>
Sun, 16 Nov 2025 23:10:28 +0000 (15:10 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 16 Nov 2025 23:11:41 +0000 (15:11 -0800)
The previous step replaced deprecated macos-13 image with macos-14
image on GitHub Actions CI.  While x86-64 binaries can work there,
because macos-14 images are arm64 based (we could replace it with
macos-14-large that is x86-64), it makes more sense to use arm64
binary there.  Without this change, we have been getting unusually
higher rate of failures from random macOS CI jobs railing to run
t98xx series of tests.

Helped-by: Koji Nakamaru <koji.nakamaru@gree.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
ci/install-dependencies.sh

index 6668c4df849350f243cf6948af11575ffbaa9909..51ffa7c1ec7dae18b12830d73bfb7525bdb57e88 100755 (executable)
@@ -103,7 +103,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