summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-09-25 11:13:11 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-09-25 11:13:11 (GMT)
commit8f0b94f037c765b9068d39a7f3d7a0f69ed2d3de (patch)
tree043b28d29bd2976d9edb2aef69256c073d81704d
parent9e43cbb9739ecfd05d38ff31a49050a0eb04505b (diff)
parente4fcd7152b8701ae9adbf0cc608572d7f253e2c3 (diff)
downloadtcl-8f0b94f037c765b9068d39a7f3d7a0f69ed2d3de.zip
tcl-8f0b94f037c765b9068d39a7f3d7a0f69ed2d3de.tar.gz
tcl-8f0b94f037c765b9068d39a7f3d7a0f69ed2d3de.tar.bz2
Merge 8.5
-rw-r--r--.travis.yml32
1 files changed, 9 insertions, 23 deletions
diff --git a/.travis.yml b/.travis.yml
index 7830949..0abaeb4 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
@@ -53,29 +55,15 @@ jobs:
env:
- BUILD_DIR=unix
- CFGOPT="--enable-symbols=mem"
-# 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"
@@ -84,13 +72,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
@@ -373,6 +359,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