We see macOS CI job failures from time to time when the version of p4 brew expects is slightly older than what is offered at Perforce's download site. Instead of failing to run the tests altogether, just skip "git-p4" tests, like we do for tests that depends on any other optional packages, when this happens. This is essentially unchanged from the v3 posted by Carlo on April 23rd, with a few fix-ups that have been cooking on top squashed in. The changes from the previous round (i.e. the "fix-ups" that have been floating on top, which got squashed in) are: * The first step has a fix to a couple of wrong redirections that created a junk file whose name is "2", instead of sending the messages to the standard error. * The last step makes two places that we download Perforce packages to use https://cdist2.perforce.com/ (earlier one of the places used that, the other https://filehost.perforce.com/). I am sending this out as a final "complain now, or this will go to 'next' soonish" warning. The "What's cooking" report is getting crowded with too many topics marked as "Expecting a reroll", and I'm trying to do easier ones myself to see how much reduction we can make. Carlo Marcelo Arenas Belón (3): ci: make failure to find perforce more user friendly ci: avoid brew for installing perforce ci: reintroduce prevention from perforce being quarantined in macOS �var Arnfjörð Bjarmason (1): ci: use https, not http to download binaries from perforce.com ci/install-dependencies.sh | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) 1: 5730a749bc ! 1: 024459486c ci: make failure to find perforce more user friendly @@ ci/install-dependencies.sh: linux-gcc-default) echo "$(tput setaf 6)Perforce Client Version$(tput sgr0)" p4 -V | grep Rev. +else -+ echo "WARNING: perforce wasn't installed, see above for clues why" >2 ++ echo >&2 "WARNING: perforce wasn't installed, see above for clues why" fi -if type git-lfs >/dev/null +if type git-lfs >/dev/null 2>&1 @@ ci/install-dependencies.sh: linux-gcc-default) echo "$(tput setaf 6)Git-LFS Version$(tput sgr0)" git-lfs version +else -+ echo "WARNING: git-lfs wasn't installed, see above for clues why" >2 ++ echo >&2 "WARNING: git-lfs wasn't installed, see above for clues why" fi 2: 8cd96645ae = 2: 8717dbe8d9 ci: avoid brew for installing perforce 3: 1f06d0ba06 = 3: 6a4f085d63 ci: reintroduce prevention from perforce being quarantined in macOS 4: 6bf267b995 ! 4: 5be72d9150 ci: use https, not http to download binaries from perforce.com @@ Commit message at least, and is one less thing to worry about when checking where else we rely on non-TLS'd http connections. + Also, use the same download site at perforce.com for Linux and macOS + tarballs for consistency. + Signed-off-by: �var Arnfjörð Bjarmason <avarab@xxxxxxxxx> + Signed-off-by: Carlo Marcelo Arenas Belón <carenas@xxxxxxxxx> Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx> ## ci/install-dependencies.sh ## @@ ci/install-dependencies.sh . ${0%/*}/lib.sh -P4WHENCE=http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION -+P4WHENCE=https://filehost.perforce.com/perforce/r$LINUX_P4_VERSION ++P4WHENCE=https://cdist2.perforce.com/perforce/r$LINUX_P4_VERSION 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 -- 2.36.1-338-g1c7f76a54c
