mirror of https://github.com/mpv-player/mpv
travis: fix macOS VMs with older homebrew versions
apparently travis changed the homebrew setup and that broke the build. reasons was a different homebrew version that doesn't support the new brew cli.
This commit is contained in:
parent
7f8d069087
commit
93066ff12f
10
.travis.yml
10
.travis.yml
|
@ -118,13 +118,21 @@ before_install:
|
||||||
fi
|
fi
|
||||||
- |
|
- |
|
||||||
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
|
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
|
||||||
|
if [[ "$TRAVIS_OSX_IMAGE" == "xcode12.2" ]]; then
|
||||||
remove=$(brew list --formula)
|
remove=$(brew list --formula)
|
||||||
|
else
|
||||||
|
remove=$(brew list)
|
||||||
|
fi
|
||||||
keep="gettext pcre2 git"
|
keep="gettext pcre2 git"
|
||||||
install="autoconf automake pkg-config libtool python freetype fribidi little-cms2 luajit libass ffmpeg"
|
install="autoconf automake pkg-config libtool python freetype fribidi little-cms2 luajit libass ffmpeg"
|
||||||
for formula in ${keep[@]}; do remove=("${remove[@]/$formula}"); done
|
for formula in ${keep[@]}; do remove=("${remove[@]/$formula}"); done
|
||||||
for formula in ${install[@]}; do remove=("${remove[@]/$formula}"); done
|
for formula in ${install[@]}; do remove=("${remove[@]/$formula}"); done
|
||||||
brew remove --force $remove --ignore-dependencies
|
brew remove --force $remove --ignore-dependencies
|
||||||
brew remove --cask $(brew list --cask)
|
if [[ "$TRAVIS_OSX_IMAGE" == "xcode12.2" ]]; then
|
||||||
|
brew remove $(brew list --cask)
|
||||||
|
else
|
||||||
|
brew cask remove $(brew cask list)
|
||||||
|
fi
|
||||||
brew untap homebrew/cask
|
brew untap homebrew/cask
|
||||||
brew update
|
brew update
|
||||||
if [[ -n "$CI_HOMEBREW_HASH" ]]; then
|
if [[ -n "$CI_HOMEBREW_HASH" ]]; then
|
||||||
|
|
Loading…
Reference in New Issue