From e19f760b92f2db9d4d6ad79e2f2f0c902e012b83 Mon Sep 17 00:00:00 2001
From: Ivan Maidanski <ivmai@mail.ru>
Date: Mon, 25 Dec 2017 10:57:58 +0300
Subject: [PATCH] Travis CI: Do not use 'trusty' build environment (backport of
 commit 468ac9bd from 'master')

---
 .travis.yml | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6fa66521..c9998819 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,6 @@ matrix:
       apt:
         packages:
         - libatomic-ops-dev
-    dist: trusty
     env:
     - MAKEFILE_TARGETS="distcheck"
     - AUTOMAKE_VER=1.15
@@ -35,7 +34,6 @@ matrix:
         packages:
         - libatomic-ops-dev
     compiler: clang
-    dist: trusty
     env:
     - CONF_OPTIONS="--enable-cplusplus"
     - NO_CLONE_LIBATOMIC_OPS=true
@@ -45,7 +43,6 @@ matrix:
         packages:
         - libatomic-ops-dev
     compiler: gcc
-    dist: trusty
     env:
     - CONF_OPTIONS="--enable-gc-assertions --enable-cplusplus"
     - NO_CLONE_LIBATOMIC_OPS=true
@@ -107,7 +104,6 @@ matrix:
         packages:
         - libatomic-ops-dev
     compiler: gcc
-    dist: trusty
     env:
     - CONF_OPTIONS="--with-libatomic-ops=yes --enable-gc-assertions --enable-cplusplus"
     - NO_CLONE_LIBATOMIC_OPS=true
@@ -140,7 +136,6 @@ matrix:
     - CONF_OPTIONS="--enable-cplusplus --disable-docs"
   - os: linux
     compiler: gcc
-    dist: trusty
     env:
     - CFLAGS_EXTRA="-std=c11 -D GC_NO_SIGSETJMP"
     - CONF_OPTIONS="--disable-threads --enable-gc-assertions --enable-cplusplus"
@@ -232,7 +227,6 @@ matrix:
         sources:
         - llvm-toolchain-trusty-4.0
     compiler: clang-4.0
-    dist: trusty
     language: c
     env:
     - CSA_CHECK=true
@@ -265,7 +259,6 @@ matrix:
         packages:
         - musl-tools
     compiler: musl-gcc
-    dist: trusty
     language: c
     env:
     - CONF_OPTIONS="--disable-parallel-mark --enable-gc-assertions"
@@ -277,7 +270,6 @@ matrix:
         sources:
         - llvm-toolchain-trusty-4.0
     compiler: clang-4.0
-    dist: trusty
     language: c
     env:
     - CXX=clang++-4.0
@@ -292,7 +284,6 @@ matrix:
         sources:
         - ubuntu-toolchain-r-test
     compiler: gcc-5
-    dist: trusty
     language: c
     env:
     - CFLAGS_EXTRA="-fsanitize=address -O0"
@@ -310,7 +301,6 @@ matrix:
         sources:
         - llvm-toolchain-trusty-4.0
     compiler: clang-4.0
-    dist: trusty
     language: c
     env:
     - CFLAGS_EXTRA="-fsanitize=memory -fno-omit-frame-pointer -D NO_INCREMENTAL"
@@ -331,7 +321,6 @@ matrix:
         sources:
         - llvm-toolchain-trusty-4.0
     compiler: clang-4.0
-    dist: trusty
     language: c
     env:
     - CXX=clang++-4.0
@@ -346,7 +335,6 @@ matrix:
         sources:
         - llvm-toolchain-trusty-4.0
     compiler: clang-4.0
-    dist: trusty
     language: c
     env:
     - CFLAGS_EXTRA="-m32 -D _FORTIFY_SOURCE=2 -D GC_DISABLE_INCREMENTAL"
@@ -360,7 +348,6 @@ matrix:
         sources:
         - ubuntu-toolchain-r-test
     compiler: gcc-5
-    dist: trusty
     language: c
     env:
     - CXX=g++-5
@@ -375,7 +362,6 @@ matrix:
         sources:
         - ubuntu-toolchain-r-test
     compiler: gcc-5
-    dist: trusty
     language: c
     env:
     - CFLAGS_EXTRA="-m32 -O3"
@@ -390,7 +376,6 @@ matrix:
         sources:
         - ubuntu-toolchain-r-test
     compiler: gcc-5
-    dist: trusty
     language: c
     env:
     - CFLAGS_EXTRA="-mx32 -march=native -D _FORTIFY_SOURCE=2 -D NO_INCREMENTAL"
@@ -402,7 +387,6 @@ matrix:
         - g++-mingw-w64
         - gcc-mingw-w64
     compiler: x86_64-w64-mingw32-gcc
-    dist: trusty
     language: c
     env:
     - CXX=x86_64-w64-mingw32-g++
@@ -414,7 +398,6 @@ matrix:
         packages:
         - gcc-mingw-w64
     compiler: i686-w64-mingw32-gcc
-    dist: trusty
     language: c
     env:
     - CONF_OPTIONS="--host=i686-w64-mingw32 --enable-munmap"
-- 
2.50.1