ci: cleanup

Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>

ci/install-dependencies.sh

@@ -5,14 +5,15 @@
 
 . ${0%/*}/lib.sh
 
-P4WHENCE=https://cdist2.perforce.com/perforce/r$LINUX_P4_VERSION
-LFSWHENCE=https://github.com/github/git-lfs/releases/download/v$LINUX_GIT_LFS_VERSION
+P4SOURCE=https://cdist2.perforce.com/perforce
 UBUNTU_COMMON_PKGS="make libssl-dev libcurl4-openssl-dev libexpat-dev
  tcl tk gettext zlib1g-dev perl-modules liberror-perl libauthen-sasl-perl
  libemail-valid-perl libio-socket-ssl-perl libnet-smtp-ssl-perl"
 
 case "$runs_on_pool" in
 ubuntu-latest)
+	P4WHENCE=$P4SOURCE/r$P4_AT_LINUX_VERSION
+	LFSWHENCE=https://github.com/github/git-lfs/releases/download/v$LINUX_GIT_LFS_VERSION
 	sudo apt-get -q update
 	sudo apt-get -q -y install language-pack-is libsvn-perl apache2 \
 		$UBUNTU_COMMON_PKGS $CC_PACKAGE
@@ -31,6 +32,7 @@ ubuntu-latest)
 	popd
 	;;
 macos-latest)
+	P4WHENCE=$P4SOURCE/r$P4_AT_MACOS_VERSION
 	export HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_CLEANUP=1
 	# Uncomment this if you want to run perf tests:
 	# brew install gnu-time
@@ -40,7 +42,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
 	)

ci/lib.sh

@@ -236,7 +236,8 @@ ubuntu-latest)
 	# The Linux build installs the defined dependency versions below.
 	# The OS X build installs much more recent versions
 	# Keep that in mind when you encounter a broken OS X build!
-	export LINUX_P4_VERSION="16.2"
+	P4_AT_LINUX_VERSION="16.2"
+	export P4_AT_LINUX_VERSION
 	export LINUX_GIT_LFS_VERSION="1.5.2"
 
 	P4_PATH="$HOME/custom/p4"
@@ -250,6 +251,8 @@ macos-latest)
 	else
 		MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python2)"
 	fi
+	P4_AT_MACOS_VERSION="21.2"
+	export P4_AT_MACOS_VERSION
 	;;
 esac