summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-11-12 10:16:00 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-11-12 10:16:00 (GMT)
commit011db3181f22da410d14abd5df6dc1da7d0fed6f (patch)
tree4d01ddf684235961ad07ecd0e91e4b3136de618d /.travis.yml
parent950726731dd2068e363d294fedc3d3a68da2698b (diff)
parenta57e550fe40ed58660f2b7e50f64f56bbc0e9518 (diff)
downloadtk-011db3181f22da410d14abd5df6dc1da7d0fed6f.zip
tk-011db3181f22da410d14abd5df6dc1da7d0fed6f.tar.gz
tk-011db3181f22da410d14abd5df6dc1da7d0fed6f.tar.bz2
Merge trunk. Clean-up win32 systray code (not completed yet, still some ANSI functions are used which cannot handle full Unicode)
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml24
1 files changed, 16 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml
index f4fbbd4..f8cd9e2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,8 +21,8 @@ addons:
- tcl-tk
- libnotify
- glib
- casks:
- - xquartz
+# casks:
+# - xquartz
jobs:
include:
# Testing on Linux GCC
@@ -207,12 +207,12 @@ jobs:
env:
- BUILD_DIR=unix
- CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua --enable-symbols CFLAGS=-I/usr/local/opt/tcl-tk/include"
- - name: "macOS/Xcode 12/Shared/XQuartz"
- os: osx
- osx_image: xcode12
- 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"
+# - name: "macOS/Xcode 12/Shared/XQuartz"
+# os: osx
+# osx_image: xcode12
+# 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"
# Older MacOS versions
- name: "macOS/Xcode 11/Shared"
os: osx
@@ -278,7 +278,15 @@ install:
script:
- make all tktest
- make install
+before_cache:
+ - |-
+ case $TRAVIS_OS_NAME in
+ osx)
+ brew cleanup
+ ;;
+ esac
cache:
directories:
+ - $HOME/Library/Caches/Homebrew
- $HOME/AppData/Local/Temp/chocolatey
- $HOME/AppData/Local/Apps/Tcl86