summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-08-18 09:33:23 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-08-18 09:33:23 (GMT)
commitc40f7dce9a850527652b4026480a50c415d248f2 (patch)
tree60affaa3e30a1d8cc8edac79fa5a4b7f19fecab0 /.travis.yml
parentb60b0d50f5e96a40b302de1be13f383e98148aec (diff)
parentba1d2d6a1b366d9ab02e863d9eb93a70e8e4d0e7 (diff)
downloadtk-c40f7dce9a850527652b4026480a50c415d248f2.zip
tk-c40f7dce9a850527652b4026480a50c415d248f2.tar.gz
tk-c40f7dce9a850527652b4026480a50c415d248f2.tar.bz2
Merge 8.5
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml16
1 files changed, 8 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml
index 47eba63..fc0773d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -112,9 +112,9 @@ jobs:
- BUILD_DIR=unix
- CFGOPT="--enable-symbols"
# Testing on Mac, various styles
- - name: "macOS/Clang/Xcode 11.5/Shared"
+ - name: "macOS/Clang/Xcode 11.6/Shared"
os: osx
- osx_image: xcode11.5
+ osx_image: xcode11.6
env:
- BUILD_DIR=unix
- CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include"
@@ -122,27 +122,27 @@ jobs:
- ./configure ${CFGOPT} "--prefix=$HOME" || (cat config.log && exit 1)
script: &mactest
- make binaries libraries tktest
- - name: "macOS/Clang/Xcode 11.5/Static"
+ - name: "macOS/Clang/Xcode 11.6/Static"
os: osx
- osx_image: xcode11.5
+ osx_image: xcode11.6
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"
install:
- ./configure ${CFGOPT} "--prefix=$HOME" || (cat config.log && exit 1)
script: *mactest
- - name: "macOS/Clang/Xcode 11.5/Debug"
+ - name: "macOS/Clang/Xcode 11.6/Debug"
os: osx
- osx_image: xcode11.5
+ osx_image: xcode11.6
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"
install:
- ./configure ${CFGOPT} "--prefix=$HOME" || (cat config.log && exit 1)
script: *mactest
- - name: "macOS/Clang/Xcode 11.5/Shared/XQuartz"
+ - name: "macOS/Clang/Xcode 11.6/Shared/XQuartz"
os: osx
- osx_image: xcode11.5
+ osx_image: xcode11.6
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"