From ce1571ac01e815c71a6075a4bad1c7b5ec4820dd Mon Sep 17 00:00:00 2001 From: der richter Date: Fri, 25 Dec 2020 14:47:35 +0100 Subject: mac: drop build support for swift versions earlier than version 4.1 this drops support for swift <4.1 and with this support for xcode <=9.2. this was the last setup that is officially working on macOS 10.12. our old legacy build macOS 10.12 + xcode 9.2 is replaced by macOS 10.13 + xcode 9.4.1 with swift 4.1. the macOS 10.13 + xcode 10.1 VM is replaced by the latest macOS 10.14 + xcode 11.3.1 VM. this is the oldest version officially supported by Apple. this is in preparations for the following commit. --- .travis.yml | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 85d4cc2485..18946c05e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,18 +36,13 @@ matrix: - <<: *mac osx_image: xcode12.2 - <<: *mac - osx_image: xcode10.1 - env: - - HOMEBREW_NO_AUTO_UPDATE=1 - - HOMEBREW_NO_INSTALL_CLEANUP=1 - - CI_HOMEBREW_HASH=7242872d7878f1a4c2706e5837faafcf0782b58d + osx_image: xcode11.3 - <<: *mac - osx_image: xcode9.2 + osx_image: xcode9.4 env: - HOMEBREW_NO_AUTO_UPDATE=1 - HOMEBREW_NO_INSTALL_CLEANUP=1 - - CI_SWIFT_FLAGS="\-target x86_64-apple-macosx10.12" - - CI_HOMEBREW_HASH=55e02323812604add9a69bab8730319b9255a697 + - CI_HOMEBREW_HASH=7242872d7878f1a4c2706e5837faafcf0782b58d - os: freebsd compiler: clang - os: linux @@ -62,7 +57,7 @@ matrix: env: CI_SCRIPT=ci/build-mingw64.sh TARGET=x86_64-w64-mingw32 allow_failures: - os: osx - osx_image: xcode9.2 + osx_image: xcode9.4 fast_finish: true dist: focal @@ -123,15 +118,14 @@ before_install: fi - | if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - remove=$(brew list) + remove=$(brew list --formula) 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 - if [[ "$TRAVIS_OSX_IMAGE" == "xcode9.2" ]]; then - brew untap caskroom/cask - fi + brew remove --cask $(brew list --cask) + brew untap homebrew/cask brew update if [[ -n "$CI_HOMEBREW_HASH" ]]; then pushd "/usr/local/Homebrew/Library/Taps/homebrew/homebrew-core" -- cgit v1.2.3