diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-11-29 04:41:05 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-11-29 04:41:06 +0300 |
commit | 515ffabccf75c221cbb6bcef7eb8f89f6c832da9 (patch) | |
tree | b4fe6e44e03325d025cbb22b415789d58fb1c7c8 /ci | |
parent | 8165c6af118b0b484dedf7df1be19645461db923 (diff) | |
parent | 0d3507f3e7b74ccbaa6f1ddc282cf467cce0e102 (diff) |
Merge branch 'jx/ci-ubuntu-fix'
Adjust the GitHub CI to newer ubuntu release.
* jx/ci-ubuntu-fix:
ci: install python on ubuntu
ci: use the same version of p4 on both Linux and macOS
ci: remove the pipe after "p4 -V" to catch errors
github-actions: run gcc-8 on ubuntu-20.04 image
Diffstat (limited to 'ci')
-rwxr-xr-x | ci/install-dependencies.sh | 12 | ||||
-rwxr-xr-x | ci/lib.sh | 11 |
2 files changed, 11 insertions, 12 deletions
diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index 107757a1fe..d8fafc8ed2 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -5,17 +5,17 @@ . ${0%/*}/lib.sh -P4WHENCE=https://cdist2.perforce.com/perforce/r$LINUX_P4_VERSION +P4WHENCE=https://cdist2.perforce.com/perforce/r21.2 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 libemail-valid-perl libio-socket-ssl-perl libnet-smtp-ssl-perl" case "$runs_on_pool" in -ubuntu-latest) +ubuntu-*) sudo apt-get -q update sudo apt-get -q -y install language-pack-is libsvn-perl apache2 \ - $UBUNTU_COMMON_PKGS $CC_PACKAGE + $UBUNTU_COMMON_PKGS $CC_PACKAGE $PYTHON_PACKAGE mkdir --parents "$P4_PATH" pushd "$P4_PATH" wget --quiet "$P4WHENCE/bin.linux26x86_64/p4d" @@ -40,7 +40,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 ) @@ -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 echo "$(tput setaf 6)Perforce Client Version$(tput sgr0)" - p4 -V | grep Rev. + p4 -V else echo >&2 "WARNING: perforce wasn't installed, see above for clues why" fi @@ -226,18 +226,18 @@ export GIT_TEST_CLONE_2GB=true export SKIP_DASHED_BUILT_INS=YesPlease case "$runs_on_pool" in -ubuntu-latest) +ubuntu-*) if test "$jobname" = "linux-gcc-default" then break fi - if [ "$jobname" = linux-gcc ] + PYTHON_PACKAGE=python2 + if test "$jobname" = linux-gcc then - MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/python3" - else - MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/python2" + PYTHON_PACKAGE=python3 fi + MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/$PYTHON_PACKAGE" export GIT_TEST_HTTPD=true @@ -246,7 +246,6 @@ ubuntu-latest) # 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_GIT_LFS_VERSION="1.5.2" P4_PATH="$HOME/custom/p4" |