Carlo Marcelo Arenas Belón <carenas@xxxxxxxxx> writes:
> Not sure why this is suddently faiing, but this proposed fixup also
> makes both server names consistent and would be easier to clean up
> later.
Yeah, I was wondering why the other one uses a fully hardcoded URL
that these variables do not know about.
Would it make sense to rename LINUX_P4_VERSION to P4_AT_PERFORCE_VERSION
or something and set it also in the macOS section in ci/lib.sh? We have
# The Linux build installs the defined dependency versions below.
# The OS X build installs much more recent versions, whichever
# 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"
which if I am reading your series correctly has become stale; we no
longer rely on brew/cask, and do this for macOS identically to what
we do here for Linux.
> Signed-off-by: Carlo Marcelo Arenas Belón <carenas@xxxxxxxxx>
> ---
> ci/install-dependencies.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
> index 98444821729..b8ace0355e2 100755
> --- a/ci/install-dependencies.sh
> +++ b/ci/install-dependencies.sh
> @@ -5,7 +5,7 @@
>
> . ${0%/*}/lib.sh
>
> -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
