From 93066ff12f06d47e7a1a79e69a4cda95631a1553 Mon Sep 17 00:00:00 2001 From: der richter Date: Sat, 6 Feb 2021 14:25:17 +0100 Subject: [PATCH] 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. --- .travis.yml | 12 ++++++++++-- 1 file 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