Jiang Xin <worldhello.net@xxxxxxxxx> writes:
> From: Jiang Xin <zhiyou.jx@xxxxxxxxxxxxxxx>
>
> There would be a segmentation fault when running p4 v16.2 on ubuntu
> 22.04 which is the latest version of ubuntu runner image for github
> actions.
>
> By checking each version from [1], p4d version 21.1 and above can work
> properly on ubuntu 22.04. But version 22.x will break some p4 test
> cases. So p4 version 21.x is exactly the version we can use.
>
> With this update, the versions of p4 for Linux and macOS happen to be
> the same. So we can add the version number directly into the "P4WHENCE"
> variable, and reuse it in p4 installation for macOS.
Makes sense. This needs to be retitled from a statement of the fact ...
> Subject: Re: [PATCH v4 3/4] ci: p4 on Linux has the same version as on macOS
... to description of a choice _we_ made, e.g.
ci: use the same version of p4 on both Linux and macOS
or something like that.
Other than that, looks good.
Thanks.
> By removing the "LINUX_P4_VERSION" variable from "ci/lib.sh", the
> comment left above has nothing to do with p4, but still applies to
> git-lfs. Since we have a fixed version of git-lfs installed on Linux,
> we may have a different version on macOS.
>
> [1]: https://cdist2.perforce.com/perforce/
>
> Reviewed-by: Johannes Schindelin <johannes.schindelin@xxxxxx>
> Helped-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx>
> Signed-off-by: Jiang Xin <zhiyou.jx@xxxxxxxxxxxxxxx>
> ---
> ci/install-dependencies.sh | 4 ++--
> ci/lib.sh | 1 -
> 2 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
> index 97a1a1f574..b569893b38 100755
> --- a/ci/install-dependencies.sh
> +++ b/ci/install-dependencies.sh
> @@ -5,7 +5,7 @@
>
> . ${0%/*}/lib.sh
>
> -P4WHENCE=https://cdist2.perforce.com/perforce/r$LINUX_P4_VERSION
> +P4WHENCE=https://cdist2.perforce.com/perforce/r21.2
> LFSWHENCE=https://github.com/github/git-lfs/releases/download/v$LINUX_GIT_LFS_VERSION
> UBUNTU_COMMON_PKGS="make libssl-dev libcurl4-openssl-dev libexpat-dev
> tcl tk gettext zlib1g-dev perl-modules liberror-perl libauthen-sasl-perl
> @@ -40,7 +40,7 @@ macos-latest)
> mkdir -p $HOME/bin
> (
> cd $HOME/bin
> - wget -q "https://cdist2.perforce.com/perforce/r21.2/bin.macosx1015x86_64/helix-core-server.tgz"; &&
> + wget -q "$P4WHENCE/bin.macosx1015x86_64/helix-core-server.tgz" &&
> tar -xf helix-core-server.tgz &&
> sudo xattr -d com.apple.quarantine p4 p4d 2>/dev/null || true
> )
> diff --git a/ci/lib.sh b/ci/lib.sh
> index eb203662c5..927b4529b0 100755
> --- a/ci/lib.sh
> +++ b/ci/lib.sh
> @@ -246,7 +246,6 @@ ubuntu-*)
> # were recorded in the Homebrew database upon creating the OS X
> # image.
> # Keep that in mind when you encounter a broken OS X build!
> - export LINUX_P4_VERSION="16.2"
> export LINUX_GIT_LFS_VERSION="1.5.2"
>
> P4_PATH="$HOME/custom/p4"
