merge(3p/git): Merge git upstream at v2.26.2
This commit is contained in:
commit
5229c9b232
1006 changed files with 149006 additions and 60819 deletions
16
third_party/git/ci/install-dependencies.sh
vendored
16
third_party/git/ci/install-dependencies.sh
vendored
|
|
@ -40,20 +40,30 @@ osx-clang|osx-gcc)
|
|||
test -z "$BREW_INSTALL_PACKAGES" ||
|
||||
brew install $BREW_INSTALL_PACKAGES
|
||||
brew link --force gettext
|
||||
brew cask install --no-quarantine perforce || {
|
||||
# Update the definitions and try again
|
||||
cask_repo="$(brew --repository)"/Library/Taps/homebrew/homebrew-cask &&
|
||||
git -C "$cask_repo" pull --no-stat &&
|
||||
brew cask install --no-quarantine perforce
|
||||
} ||
|
||||
brew install caskroom/cask/perforce
|
||||
case "$jobname" in
|
||||
osx-gcc)
|
||||
brew link gcc@8
|
||||
brew install gcc@9
|
||||
# Just in case the image is updated to contain gcc@9
|
||||
# pre-installed but not linked.
|
||||
brew link gcc@9
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
StaticAnalysis)
|
||||
sudo apt-get -q update
|
||||
sudo apt-get -q -y install coccinelle
|
||||
sudo apt-get -q -y install coccinelle libcurl4-openssl-dev libssl-dev \
|
||||
libexpat-dev gettext
|
||||
;;
|
||||
Documentation)
|
||||
sudo apt-get -q update
|
||||
sudo apt-get -q -y install asciidoc xmlto
|
||||
sudo apt-get -q -y install asciidoc xmlto docbook-xsl-ns
|
||||
|
||||
test -n "$ALREADY_HAVE_ASCIIDOCTOR" ||
|
||||
gem install --version 1.5.8 asciidoctor
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue