summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml30
1 files changed, 19 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml
index 29a66d8..fc0773d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,3 @@
-sudo: required
language: c
addons:
apt:
@@ -17,8 +16,7 @@ addons:
- tcl-tk
casks:
- xquartz
- update: true
-matrix:
+jobs:
include:
# Testing on Linux with various compilers
- name: "Linux/GCC/Shared"
@@ -114,9 +112,9 @@ matrix:
- 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"
@@ -124,27 +122,27 @@ matrix:
- ./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"
@@ -164,6 +162,11 @@ matrix:
- name: "macOS/Clang/Xcode 10/Shared"
os: osx
osx_image: xcode10.3
+ addons:
+ homebrew:
+ packages:
+ - tcl-tk
+ update: true
env:
- BUILD_DIR=unix
- CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include CPPFLAGS=-mmacosx-version-min=10.14"
@@ -173,6 +176,11 @@ matrix:
- name: "macOS/Clang/Xcode 9/Shared"
os: osx
osx_image: xcode9.4
+ addons:
+ homebrew:
+ packages:
+ - tcl-tk
+ update: true
env:
- BUILD_DIR=unix
- CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include CPPFLAGS=-mmacosx-version-min=10.13"