Subject: [PATCH] fixup! CI: move p4 and git-lfs variables to ci/install-dependencies.sh

From: Carlo Marcelo Arenas Belón <[email-masked]>
Date: Sat, 23 Apr 2022 13:11:29 -0700

Once the code was moved into an ubuntu specific branch, it doesn't make
sense anymore to refer to logic that only applies to a different branch

Cleanup the comment to allow for the implementation to change without
making it stale, and while at it rename the variable used to track the
P4 version to something slightly less confusing.

Signed-off-by: Carlo Marcelo Arenas Belón <[email-masked]>
---
 ci/install-dependencies.sh | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
index 098baeef3fb..7bea45fd339 100755
--- a/ci/install-dependencies.sh
+++ b/ci/install-dependencies.sh
@@ -23,11 +23,9 @@ esac
 case "$runs_on_pool" in
 ubuntu-latest)
 	# 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.
+	# The OS X build installs much more recent versions
 	# Keep that in mind when you encounter a broken OS X build!
-	LINUX_P4_VERSION="16.2"
+	P4_AT_LINUX_VERSION="16.2"
 	LINUX_GIT_LFS_VERSION="1.5.2"
 
 	P4_PATH="$HOME/custom/p4"
@@ -39,7 +37,7 @@ ubuntu-latest)
 		echo "$PATH" >>"$GITHUB_PATH"
 	fi
 
-	P4WHENCE=http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION
+	P4WHENCE=http://filehost.perforce.com/perforce/r$P4_AT_LINUX_VERSION
 	LFSWHENCE=https://github.com/github/git-lfs/releases/download/v$LINUX_GIT_LFS_VERSION
 
 	sudo apt-get -q update
-- 
2.36.0.266.g59f845bde02