From: Koji Nakamaru <koji.nakamaru@gree.net>
Date: Sun, 16 Nov 2025 15:23:34 GMT
Subject: Re: CI Failures (osx with p4)
Message-ID: <CAOTNsDwS2er+31iFt4EnhW_ZupPG+Uree_qobBVj9v1q1+0vPA@mail.gmail.com>
In-Reply-To: <xmqqqzu0gxq2.fsf_-_@gitster.g>

On Sat, Nov 15, 2025 at 5:34 AM Junio C Hamano <gitster@pobox.com> wrote:
>
> Speaking of CI failures, I think we are seeing unusually high rate
> of failures from random osx jobs failing to successfully run t98xx
> series.  Is p4 on macOSX still a thing?  As macOSX tests tend to
> take very long to complete compared to other jobs, I am tempted to
> suggest dropping p4 tests from there.
>
> Opinions?
>
> ----- >8 -----
> Subject: [PATCH] CI: drop Perforce tests from macOSX jobs
>
> It seems that we seem to be getting unusually higher rate of
> failures from random macOSX jobs failing to run t98xx series, even
> though we haven't changed Perforce interaction part of our codebase
> for quite some time, and the failures seem to be limited to macOSX
> jobs and no other platforms.
>
> Most importantly, nobody from the macOSX community seems to have
> raised an issue here, reporting any failures.
>
> Perhaps we should stop testing the combination of P4 and macOSX to
> save cycles, electricity, and my sanity ;-)
>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
>  ci/install-dependencies.sh | 4 ----
>  1 file changed, 4 deletions(-)
>
> diff --git c/ci/install-dependencies.sh w/ci/install-dependencies.sh
> index 50628ee2dd..3f718dad41 100755
> --- c/ci/install-dependencies.sh
> +++ w/ci/install-dependencies.sh
> @@ -109,10 +109,6 @@ macos-*)
>         brew link --force gettext
>
>         mkdir -p "$CUSTOM_PATH"
> -       wget -q "$P4WHENCE/bin.macosx1015x86_64/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
>
>         case "$jobname" in
>         osx-meson)
>

The cause might be that the macos-14 and later images are for arm64 [1],
but install-dependencies.sh still downloads the x86_64 Perforce
commands. This leads to Rosetta translation overhead. The arm64 Perforce
commands can be downloaded with the following modification. I confirmed
that this modified version runs without any error [2].

[1]: https://github.com/actions/runner-images?tab=readme-ov-file#available-images
[2]: https://github.com/KojiNakamaru/git/actions/runs/19407172619

--
diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
index 50628ee2dd..16ee593d30 100755
--- a/ci/install-dependencies.sh
+++ b/ci/install-dependencies.sh
@@ -7,7 +7,7 @@

 begin_group "Install dependencies"

-P4WHENCE=https://cdist2.perforce.com/perforce/r23.2
+P4WHENCE=https://cdist2.perforce.com/perforce/r24.2
 LFSWHENCE=https://github.com/github/git-lfs/releases/download/v$LINUX_GIT_LFS_VERSION
 JGITWHENCE=https://repo1.maven.org/maven2/org/eclipse/jgit/org.eclipse.jgit.pgm/6.8.0.202311291450-r/org.eclipse.jgit.pgm-6.8.0.202311291450-r.sh
 CARGO_MSRV_VERSION=0.18.4
@@ -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