On Thu, Nov 24 2022, Jiang Xin wrote: > 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. > > In addition to upgrade p4 from version 16.2 to 21.2, also add some > instructions to show errors of command "p4 -V", so we can see why the > command output doesn't match. > [...] > diff --git a/ci/lib.sh b/ci/lib.sh > index 0c0767d354..a618d66b81 100755 > --- a/ci/lib.sh > +++ b/ci/lib.sh > @@ -246,7 +246,7 @@ ubuntu) Omitted from this context is: # The Linux build installs the defined dependency versions below. # The OS X build installs much more recent versions, That part should be updated here, as it's now out-of-date, they're now installing the same version: 21.2. > # 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_P4_VERSION="21.2" > export LINUX_GIT_LFS_VERSION="1.5.2" > > P4_PATH="$HOME/custom/p4" This is a welcome change, but it would be even more welcome if you followed-up and unified the linux and osx p4 logic as a follow-up. I.e. after this we'll install 21.2 on both osx and linux, so the versions are no longer different. I think we probably won't need to install different versions for the two ever, we just drifted on the linux version, or maybe (per the comment we'll need to adjust) there was some problem before with upgrading the linux version, but no longer? I didn't dig, but covering some of that in the commit message would be most welcome. So can we just s/LINUX_P4_VERSION/P4_VERSION/ or something, and then change this in the "macos-latest"; wget -q "https://cdist2.perforce.com/perforce/r21.2/bin.macosx1015x86_64/helix-core-server.tgz"; To: wget -q "https://cdist2.perforce.com/perforce/r${P4_VERSION}/bin.macosx1015x86_64/helix-core-server.tgz"; While doing that we can just move the "LINUX_P4_VERSION" (or whatever we rename it to) from lib.sh to "install-dependencies.sh".
