summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-04-01 15:20:41 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-04-01 15:20:41 (GMT)
commitc5a38f8dee64da2d1d20ee4f95fdc0a91d5617e9 (patch)
treee3882f47e8273b91cc6990feb9ad31cc1b7a9c14 /.travis.yml
parentce6d449130e409a7fea367405d35a91a11a88ea6 (diff)
parent27d090eaa6e8705481d80193377785501b8dfe30 (diff)
downloadtk-c5a38f8dee64da2d1d20ee4f95fdc0a91d5617e9.zip
tk-c5a38f8dee64da2d1d20ee4f95fdc0a91d5617e9.tar.gz
tk-c5a38f8dee64da2d1d20ee4f95fdc0a91d5617e9.tar.bz2
Merge 8.6
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml16
1 files changed, 6 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml
index ea87be9..e8a0082 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,11 +5,12 @@ addons:
packages:
- 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
@@ -181,11 +182,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: