summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorder richter <der.richter@gmx.de>2021-02-06 14:25:17 +0100
committerder richter <der.richter@gmx.de>2021-02-13 15:51:32 +0100
commit93066ff12f06d47e7a1a79e69a4cda95631a1553 (patch)
tree9356027df1763534e5abc022c141f28be2def5fa
parent7f8d069087ab31cfe502e6daad4e04a37399a125 (diff)
downloadmpv-93066ff12f06d47e7a1a79e69a4cda95631a1553.tar.bz2
mpv-93066ff12f06d47e7a1a79e69a4cda95631a1553.tar.xz
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.
-rw-r--r--.travis.yml12
1 files changed, 10 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 18946c05e1..0ab0e75f5e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -118,13 +118,21 @@ before_install:
fi
- |
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
- remove=$(brew list --formula)
+ if [[ "$TRAVIS_OSX_IMAGE" == "xcode12.2" ]]; then
+ remove=$(brew list --formula)
+ else
+ remove=$(brew list)
+ fi
keep="gettext pcre2 git"
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 ${install[@]}; do remove=("${remove[@]/$formula}"); done
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 update
if [[ -n "$CI_HOMEBREW_HASH" ]]; then