diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-05-22 13:33:09 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-05-22 13:33:09 (GMT) |
| commit | 94ce35fac8fa42a081fb209997608c957ba8c9d7 (patch) | |
| tree | 7d59a2704a18cdf6c15ec6831415e0d754bd7eb5 /.travis.yml | |
| parent | bbb00f8a29c71d4dce04c53be8acd2c7bf2e5b4e (diff) | |
| download | tk-94ce35fac8fa42a081fb209997608c957ba8c9d7.zip tk-94ce35fac8fa42a081fb209997608c957ba8c9d7.tar.gz tk-94ce35fac8fa42a081fb209997608c957ba8c9d7.tar.bz2 | |
Update MacOSX build from xcode11.4 to xcode11.5
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index 3c03cf4..9c8a9dc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,13 +3,21 @@ language: c addons: apt: packages: + - binutils-mingw-w64-i686 + - binutils-mingw-w64-x86-64 + - gcc-mingw-w64 + - gcc-mingw-w64-base + - gcc-mingw-w64-i686 + - gcc-mingw-w64-x86-64 + - gcc-multilib - tcl-dev - libx11-dev -# Doesn't work at the moment, see: <https://travis-ci.community/t/macos-build-fails-because-of-homebrew-bundle-unknown-command/7296> -# homebrew: -# packages: -# - tcl-tk -# - xquartz + homebrew: + packages: + - tcl-tk + casks: + - xquartz + update: true matrix: include: # Testing on Linux with various compilers @@ -106,9 +114,9 @@ matrix: - BUILD_DIR=unix - CFGOPT="--enable-symbols" # Testing on Mac, various styles - - name: "macOS/Xcode 11.4/Shared/Unix-like" + - name: "macOS/Xcode 11.5/Shared/XQuartz" os: osx - osx_image: xcode11.4 + osx_image: xcode11.5 env: - BUILD_DIR=unix - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --disable-corefoundation --x-includes=/opt/X11/include --x-libraries=/opt/X11/lib CFLAGS=-I/usr/local/opt/tcl-tk/include" @@ -131,11 +139,6 @@ before_install: windows) choco install -y magicsplat-tcl-tk ;; - osx) - brew update - brew install tcl-tk - brew cask install xquartz - ;; esac - cd ${BUILD_DIR} install: |