From 6f7b389dd93395bc77e91a3bb5680aedf5d61a4c Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 12 Feb 2020 15:40:42 +0000
Subject: Update travis build to "bionic"

---
 .travis.yml | 68 +++++++++++++++++++++++--------------------------------------
 1 file changed, 26 insertions(+), 42 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f2095d0..792474f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,54 +5,38 @@ addons:
     packages:
       - tcl-dev
       - libx11-dev
+
 matrix:
   include:
-    - os: linux
-      dist: trusty
-      compiler: clang
-      env:
-        - BUILD_DIR=unix
-    - os: linux
-      dist: trusty
-      compiler: clang
-      env:
-        - CFGOPT=--disable-shared
-        - BUILD_DIR=unix
-    - os: linux
-      dist: trusty
+# Testing on Linux with various compilers
+    - name: "Linux/GCC/Shared"
+      os: linux
+      dist: bionic
       compiler: gcc
       env:
         - BUILD_DIR=unix
-    - os: linux
-      dist: trusty
+    - name: "Linux/GCC/Static"
+      os: linux
+      dist: bionic
       compiler: gcc
       env:
-        - CFGOPT=--disable-shared
-        - BUILD_DIR=unix
-    - os: linux
-      dist: trusty
-      compiler: gcc-4.9
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-4.9
-      env:
+        - CFGOPT="--disable-shared"
         - BUILD_DIR=unix
-    - os: linux
-      dist: trusty
-      compiler: gcc-5
+    - name: "Linux/GCC 7/Shared"
+      os: linux
+      dist: bionic
+      compiler: gcc-7
       addons:
         apt:
           sources:
             - ubuntu-toolchain-r-test
           packages:
-            - g++-5
+            - g++-7
       env:
         - BUILD_DIR=unix
-    - os: linux
-      dist: trusty
+    - name: "Linux/GCC 6/Shared"
+      os: linux
+      dist: bionic
       compiler: gcc-6
       addons:
         apt:
@@ -62,23 +46,23 @@ matrix:
             - g++-6
       env:
         - BUILD_DIR=unix
-    - os: linux
-      dist: trusty
-      compiler: gcc-7
+    - name: "Linux/GCC 5/Shared"
+      os: linux
+      dist: bionic
+      compiler: gcc-5
       addons:
         apt:
           sources:
             - ubuntu-toolchain-r-test
           packages:
-            - g++-7
+            - g++-5
       env:
         - BUILD_DIR=unix
 before_install:
-  - export ERROR_ON_FAILURES=1
   - cd ${BUILD_DIR}
 install:
-  - test -n "$NO_DIRECT_CONFIGURE" || ./configure ${CFGOPT}
+  - ./configure ${CFGOPT} --prefix=$HOME || (cat config.log && exit 1)
+before_script:
+  - export ERROR_ON_FAILURES=1
 script:
-  - make
-  # The styles=develop avoids some weird problems on OSX
-  #- test -n "$NO_DIRECT_TEST" || make test styles=develop
+  - make all tktest
-- 
cgit v0.12