summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-09-04 16:57:23 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-09-04 16:57:23 (GMT)
commited825e13f3d05988eacdfaf8e978377149b9302b (patch)
tree25fca705201f20c6370bfc7ff7e0ce28c3fdb349
parent71f52ef43250086759c25b7bb44760a9510dd8f1 (diff)
parent158d93761d58b9a91d24a5a56c6cda2cddd22878 (diff)
downloadtk-ed825e13f3d05988eacdfaf8e978377149b9302b.zip
tk-ed825e13f3d05988eacdfaf8e978377149b9302b.tar.gz
tk-ed825e13f3d05988eacdfaf8e978377149b9302b.tar.bz2
Merge 8.6
-rw-r--r--.travis.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 95dd99b..8b9c9d1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -149,7 +149,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"
@@ -171,7 +171,7 @@ jobs:
- make all 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"
@@ -180,7 +180,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"
@@ -189,7 +189,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"