summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-09-25 11:21:05 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-09-25 11:21:05 (GMT)
commitead0e26f5236020b5b9ada6a36230738eaacdc90 (patch)
tree019598c46c2ca90a1916704520fbd1a77ce7503e /.travis.yml
parent74b68e5bba6eb2118332003a0afdcfd7a02e6e4d (diff)
parentfb53594d58c04fb24664ca3caf229a5d6971ea86 (diff)
downloadtcl-ead0e26f5236020b5b9ada6a36230738eaacdc90.zip
tcl-ead0e26f5236020b5b9ada6a36230738eaacdc90.tar.gz
tcl-ead0e26f5236020b5b9ada6a36230738eaacdc90.tar.bz2
Merge 8.6
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml32
1 files changed, 9 insertions, 23 deletions
diff --git a/.travis.yml b/.travis.yml
index 9ccfc25..a3b4b7d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,8 @@
language: c
addons:
apt:
+ sources:
+ - ubuntu-toolchain-r-test
packages:
- binutils-mingw-w64-i686
- binutils-mingw-w64-x86-64
@@ -11,7 +13,7 @@ addons:
- gcc-multilib
jobs:
include:
-# Testing on Linux with various compilers
+# Testing on Linux GCC
- name: "Linux/GCC/Shared"
os: linux
dist: focal
@@ -61,29 +63,15 @@ jobs:
env:
- BUILD_DIR=unix
- CFGOPT="CC=g++ CFLAGS=-Dregister=dont+use+register"
-# Older versions of GCC...
- - name: "Linux/GCC 7/Shared"
+# Newer/Older versions of GCC
+ - name: "Linux/GCC 10/Shared"
os: linux
dist: focal
- compiler: gcc-7
+ compiler: gcc-10
addons:
apt:
- sources:
- - ubuntu-toolchain-r-test
packages:
- - g++-7
- env:
- - BUILD_DIR=unix
- - name: "Linux/GCC 6/Shared"
- os: linux
- dist: bionic
- compiler: gcc-6
- addons:
- apt:
- sources:
- - ubuntu-toolchain-r-test
- packages:
- - g++-6
+ - g++-10
env:
- BUILD_DIR=unix
- name: "Linux/GCC 5/Shared"
@@ -92,13 +80,11 @@ jobs:
compiler: gcc-5
addons:
apt:
- sources:
- - ubuntu-toolchain-r-test
packages:
- g++-5
env:
- BUILD_DIR=unix
-# Clang
+# Testing on Linux Clang
- name: "Linux/Clang/Shared"
os: linux
dist: focal
@@ -457,6 +443,6 @@ install:
before_script:
- export ERROR_ON_FAILURES=1
script:
- - make all tcltest
+ - make all tcltest || echo "Something wrong, maybe a hickup, let's try again"
- make test
- make install