[PATCH v2 2/3] ci: upgrade version of p4 to 21.2
- From
Jiang Xin <worldhello.net@gmail.com>
- Date
- Nov 24, 2022, 09:05 UTC
- Message-ID
- <20221124090545.4790-3-worldhello.net@gmail.com>
- In-Reply-To
- <20221123150233.13039-1-worldhello.net@gmail.com>
From: Jiang Xin <zhiyou.jx@alibaba-inc.com>
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.
[1]: https://cdist2.perforce.com/perforce/
Signed-off-by: Jiang Xin <zhiyou.jx@alibaba-inc.com> --- ci/install-dependencies.sh | 4 ++-- ci/lib.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index f639263a62..291e49bdde 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -83,9 +83,9 @@ esac if type p4d >/dev/null 2>&1 && type p4 >/dev/null 2>&1 then echo "$(tput setaf 6)Perforce Server Version$(tput sgr0)" - p4d -V | grep Rev. + p4d -V | grep Rev. || { echo >&2 "p4d: bad version"; p4d -V; exit 1; } echo "$(tput setaf 6)Perforce Client Version$(tput sgr0)" - p4 -V | grep Rev. + p4 -V | grep Rev. || { echo >&2 "p4: bad version"; p4 -V; exit 1; } else echo >&2 "WARNING: perforce wasn't installed, see above for clues why" fi 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) # 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"
-- 2.39.0.rc0