summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-09-26 18:32:06 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-09-26 18:32:06 (GMT)
commit866a79313bc49a69a821448e49bc9a67c97393bb (patch)
treeabe463743dce0c85c8b771f101a37c584d44332f
parent67f864dc656ad9a88f134514172bc55a2c73c3d5 (diff)
parent636e4d4826142fcd8b3d159eeca1c226ea25e9c6 (diff)
downloadtcl-866a79313bc49a69a821448e49bc9a67c97393bb.zip
tcl-866a79313bc49a69a821448e49bc9a67c97393bb.tar.gz
tcl-866a79313bc49a69a821448e49bc9a67c97393bb.tar.bz2
Merge 8.5
-rw-r--r--.travis.yml20
1 files changed, 14 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index 0abaeb4..14d651f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -105,9 +105,9 @@ jobs:
- BUILD_DIR=unix
- CFGOPT="--enable-symbols=mem"
# Testing on Mac, various styles
- - name: "macOS/Xcode 11.7/Shared"
+ - name: "macOS/Xcode 12/Shared"
os: osx
- osx_image: xcode11.7
+ osx_image: xcode12
env:
- BUILD_DIR=macosx
install: []
@@ -115,15 +115,23 @@ jobs:
- make all
# The styles=develop avoids some weird problems on OSX
- make test styles=develop
- - name: "macOS/Xcode 11.7/Shared/Unix-like"
+ - name: "macOS/Xcode 12/Shared/Unix-like"
os: osx
- osx_image: xcode11.7
+ osx_image: xcode12
env:
- BUILD_DIR=unix
+# Newer MacOS versions
+ - name: "macOS/Xcode 12/Universal Apps/Shared"
+ os: osx
+ osx_image: xcode12u
+ env:
+ - BUILD_DIR=macosx
+ install: []
+ script: *mactest
# Older MacOS versions
- name: "macOS/Xcode 11/Shared"
os: osx
- osx_image: xcode11
+ osx_image: xcode11.7
env:
- BUILD_DIR=macosx
install: []
@@ -137,7 +145,7 @@ jobs:
script: *mactest
- name: "macOS/Xcode 9/Shared"
os: osx
- osx_image: xcode9.2
+ osx_image: xcode9.4
env:
- BUILD_DIR=macosx
install: []