From 468ac9bd39e73325bb5afdc1f957eaec5ac1b3fc Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Mon, 25 Dec 2017 10:57:58 +0300 Subject: [PATCH] Travis CI: Do not use 'trusty' build environment --- .travis.yml | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index 434492a8..b13b8ace 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,6 @@ matrix: build_command_prepend: "./configure --enable-cplusplus --disable-shared --enable-single-obj-compilation" build_command: make -j check CFLAGS_EXTRA=-DLINT2 - os: linux - dist: trusty env: - MAKEFILE_TARGETS="distcheck" - AUTOMAKE_VER=1.15 @@ -41,13 +40,11 @@ matrix: - MAKEFILE_TARGETS="dist" - os: linux compiler: clang - dist: trusty env: - CONF_OPTIONS="--enable-cplusplus" - NO_CLONE_LIBATOMIC_OPS=true - os: linux compiler: gcc - dist: trusty env: - CONF_OPTIONS="--enable-gc-assertions --enable-cplusplus --enable-static" - NO_CLONE_LIBATOMIC_OPS=true @@ -112,7 +109,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 @@ -150,20 +146,17 @@ matrix: - CONF_OPTIONS="--enable-cplusplus" - os: linux compiler: gcc - dist: trusty env: - CFLAGS_EXTRA="-std=c11 -D GC_NO_SIGSETJMP" - CONF_OPTIONS="--disable-threads --enable-gc-assertions --enable-cplusplus" - NO_CLONE_LIBATOMIC_OPS=true - os: linux compiler: clang - dist: trusty env: - CONF_OPTIONS="--disable-thread-local-alloc --enable-cplusplus --enable-static" - NO_CLONE_LIBATOMIC_OPS=true - os: linux compiler: gcc - dist: trusty env: - CONF_OPTIONS="--disable-parallel-mark --disable-thread-local-alloc --enable-gc-assertions --enable-cplusplus" - os: linux @@ -255,7 +248,6 @@ matrix: sources: - llvm-toolchain-trusty-4.0 compiler: clang-4.0 - dist: trusty language: c env: - CSA_CHECK=true @@ -288,7 +280,6 @@ matrix: packages: - musl-tools compiler: musl-gcc - dist: trusty language: c env: - CONF_OPTIONS="--disable-parallel-mark --enable-gc-assertions" @@ -300,7 +291,6 @@ matrix: sources: - llvm-toolchain-trusty-4.0 compiler: clang-4.0 - dist: trusty language: c env: - CXX=clang++-4.0 @@ -316,7 +306,6 @@ matrix: sources: - ubuntu-toolchain-r-test compiler: gcc-5 - dist: trusty language: c env: - CFLAGS_EXTRA="-fsanitize=address -O0" @@ -336,7 +325,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" @@ -359,7 +347,6 @@ matrix: sources: - llvm-toolchain-trusty-4.0 compiler: clang-4.0 - dist: trusty language: c env: - CFLAGS_EXTRA="-fsanitize=thread -D NO_CANCEL_SAFE -D NO_INCREMENTAL -D USE_SPIN_LOCK -fno-omit-frame-pointer -D TEST_FORK_WITHOUT_ATFORK" @@ -373,7 +360,6 @@ matrix: sources: - llvm-toolchain-trusty-4.0 compiler: clang-4.0 - dist: trusty language: c env: - CFLAGS_EXTRA="-fsanitize=thread -D NO_CANCEL_SAFE -D NO_INCREMENTAL -D USE_SPIN_LOCK -fno-omit-frame-pointer -D NTHREADS=15" @@ -387,7 +373,6 @@ matrix: sources: - llvm-toolchain-trusty-4.0 compiler: clang-4.0 - dist: trusty language: c env: - CFLAGS_EXTRA="-fsanitize=thread -D NO_CANCEL_SAFE -D NO_INCREMENTAL -fno-omit-frame-pointer" @@ -400,7 +385,6 @@ matrix: sources: - llvm-toolchain-trusty-4.0 compiler: clang-4.0 - dist: trusty language: c env: - CXX=clang++-4.0 @@ -416,7 +400,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" @@ -431,7 +414,6 @@ matrix: sources: - ubuntu-toolchain-r-test compiler: gcc-5 - dist: trusty language: c env: - CXX=g++-5 @@ -447,7 +429,6 @@ matrix: sources: - ubuntu-toolchain-r-test compiler: gcc-5 - dist: trusty language: c env: - CFLAGS_EXTRA="-m32 -O3" @@ -463,7 +444,6 @@ matrix: sources: - ubuntu-toolchain-r-test compiler: gcc-5 - dist: trusty language: c env: - CFLAGS_EXTRA="-mx32 -march=native -D _FORTIFY_SOURCE=2" @@ -476,7 +456,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++ @@ -488,7 +467,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.40.0