summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-09-04 16:56:45 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-09-04 16:56:45 (GMT)
commit158d93761d58b9a91d24a5a56c6cda2cddd22878 (patch)
tree202539c26896f63a6b0e56d8ecadd09b2c9dd7fd
parent7fbdc22e15b48b888546a5df320f8d7ffedb78b1 (diff)
parentd3271e2d220f2768f99b11887816cacb6223c784 (diff)
downloadtk-158d93761d58b9a91d24a5a56c6cda2cddd22878.zip
tk-158d93761d58b9a91d24a5a56c6cda2cddd22878.tar.gz
tk-158d93761d58b9a91d24a5a56c6cda2cddd22878.tar.bz2
Merge 8.5
-rw-r--r--.travis.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index c783871..95c0727 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -114,7 +114,7 @@ jobs:
# Testing on Mac, various styles
- name: "macOS/Clang/Xcode 11.6/Shared"
os: osx
- osx_image: xcode11.6
+ osx_image: xcode11.7
env:
- BUILD_DIR=unix
- CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include"
@@ -124,7 +124,7 @@ jobs:
- make binaries libraries tktest
- name: "macOS/Clang/Xcode 11.6/Static"
os: osx
- osx_image: xcode11.6
+ osx_image: xcode11.7
env:
- BUILD_DIR=unix
- CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua --disable-shared CFLAGS=-I/usr/local/opt/tcl-tk/include"
@@ -133,7 +133,7 @@ jobs:
script: *mactest
- name: "macOS/Clang/Xcode 11.6/Debug"
os: osx
- osx_image: xcode11.6
+ osx_image: xcode11.7
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"
@@ -142,7 +142,7 @@ jobs:
script: *mactest
- name: "macOS/Clang/Xcode 11.6/Shared/XQuartz"
os: osx
- osx_image: xcode11.6
+ osx_image: xcode11.7
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"