From ffff0bb0dac1f1b5e559ab61ca55616dda1e87c6 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 16 Nov 2025 15:10:28 -0800 Subject: [PATCH 1/2] Use Perforce arm64 binary on macOS CI jobs 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 Signed-off-by: Junio C Hamano --- ci/install-dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index 6668c4df849350..51ffa7c1ec7dae 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -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 From 9a2fb147f2c61d0cab52c883e7e26f5b7948e3ed Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 17 Nov 2025 07:35:33 -0800 Subject: [PATCH 2/2] Git 2.52 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.52.0.adoc | 9 ++++++--- GIT-VERSION-GEN | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Documentation/RelNotes/2.52.0.adoc b/Documentation/RelNotes/2.52.0.adoc index 4df3d5a8a08793..fc78d22567b154 100644 --- a/Documentation/RelNotes/2.52.0.adoc +++ b/Documentation/RelNotes/2.52.0.adoc @@ -17,10 +17,10 @@ UI, Workflows & Features * A new command "git last-modified" has been added to show the closest ancestor commit that touched each path. - * "git refs exists" that works like "git show-ref --exists" has been - added. + * The "git refs exists" command that works like "git show-ref --exists" + has been added. - * "repo info" learns a short-hand option "-z" that is the same as + * "git repo info" learns the short-hand option "-z" that is the same as "--format=nul", and learns to report the objects format used in the repository. @@ -433,7 +433,10 @@ including security updates, are included in this release. * The version of macos image used in GitHub CI has been updated to macos-14, as the macos-13 that we have been using got deprecated. + Perforce binary used there has been changed to arm64 version to + match. (merge 73b9cdb7c4 jc/ci-use-macos-14 later to maint). + (merge ffff0bb0da jc/ci-use-arm64-p4-on-macos later to maint). * Other code cleanup, docfix, build fix, etc. (merge 529a60a885 ua/t1517-short-help-tests later to maint). diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index a6b31f2857271b..8d5bbf7b6d3efd 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,6 +1,6 @@ #!/bin/sh -DEF_VER=v2.52.0-rc2 +DEF_VER=v2.52.0 LF=' '