summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-08-12 06:47:37 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-08-12 06:47:37 (GMT)
commita6f978e38d8c7689dc1e15973c12df2d9f14756d (patch)
tree0c897a6a1c0262e83f9a5a8490c2d5760d6578e3 /.travis.yml
parentb3f8c269fa4910edabe381bf6ec17ecdb2bb19e1 (diff)
parent39db46fbe1fa4d967e7a31b5b6ba03fd36cefffa (diff)
downloadtcl-a6f978e38d8c7689dc1e15973c12df2d9f14756d.zip
tcl-a6f978e38d8c7689dc1e15973c12df2d9f14756d.tar.gz
tcl-a6f978e38d8c7689dc1e15973c12df2d9f14756d.tar.bz2
Merge 8.6
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml30
1 files changed, 12 insertions, 18 deletions
diff --git a/.travis.yml b/.travis.yml
index f05a9df..67f1783 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,3 @@
-sudo: false
language: c
addons:
apt:
@@ -10,11 +9,7 @@ addons:
- gcc-mingw-w64-i686
- gcc-mingw-w64-x86-64
- gcc-multilib
- homebrew:
- packages:
- - libtommath
- update: true
-matrix:
+jobs:
include:
# Testing on Linux with various compilers
- name: "Linux/GCC/Shared"
@@ -154,6 +149,17 @@ matrix:
osx_image: xcode11.5
env:
- BUILD_DIR=unix
+ - name: "macOS/Clang/Xcode 11.5/Shared/libtommath"
+ os: osx
+ osx_image: xcode11.5
+ env:
+ - BUILD_DIR=macosx
+ install: []
+ script: *mactest
+ addons:
+ homebrew:
+ packages:
+ - libtommath
- name: "macOS/Clang++/Xcode 11.5/Shared"
os: osx
osx_image: xcode11.5
@@ -177,10 +183,6 @@ matrix:
- BUILD_DIR=macosx
install: []
script: *mactest
- addons:
- homebrew:
- packages:
- - libtommath
- name: "macOS/Clang/Xcode 9/Shared"
os: osx
osx_image: xcode9.2
@@ -188,10 +190,6 @@ matrix:
- BUILD_DIR=macosx
install: []
script: *mactest
- addons:
- homebrew:
- packages:
- - libtommath
- name: "macOS/Clang/Xcode 8/Shared"
os: osx
osx_image: xcode8.3
@@ -199,10 +197,6 @@ matrix:
- BUILD_DIR=macosx
install: []
script: *mactest
- addons:
- homebrew:
- packages:
- - libtommath
# Test with mingw-w64 cross-compile
# Doesn't run tests because wine is only an imperfect Windows emulation
- name: "Linux-cross-Windows/GCC/Shared/no test"