From 34d56d308343e092d5ef95e4381a55e6d01c1d94 Mon Sep 17 00:00:00 2001 From: Nuno Lopes Date: Sat, 20 Feb 2021 11:43:53 +0000 Subject: [PATCH] travis: simplify task of bots timing out --- .travis.yml | 18 ++++++++---------- .../z3_base_ubuntu_18.04.Dockerfile | 2 -- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index ae69db3707b..528576fbe3b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,23 +23,21 @@ env: # clang #too slow; times out: - LINUX_BASE=ubuntu_18.04 C_COMPILER=clang CXX_COMPILER=clang++ TARGET_ARCH=x86_64 Z3_BUILD_TYPE=Debug UBSAN_BUILD=1 RUN_UNIT_TESTS=BUILD_AND_RUN - - LINUX_BASE=ubuntu_18.04 C_COMPILER=clang CXX_COMPILER=clang++ TARGET_ARCH=x86_64 Z3_BUILD_TYPE=Debug ASAN_BUILD=1 RUN_UNIT_TESTS=BUILD_AND_RUN + - LINUX_BASE=ubuntu_18.04 C_COMPILER=clang CXX_COMPILER=clang++ TARGET_ARCH=x86_64 Z3_BUILD_TYPE=Debug ASAN_BUILD=1 RUN_UNIT_TESTS=BUILD_AND_RUN DOTNET_BINDINGS=0 JAVA_BINDINGS=0 PYTHON_BINDINGS=0 - LINUX_BASE=ubuntu_18.04 C_COMPILER=clang CXX_COMPILER=clang++ TARGET_ARCH=x86_64 Z3_BUILD_TYPE=Release UBSAN_BUILD=1 RUN_UNIT_TESTS=BUILD_AND_RUN - LINUX_BASE=ubuntu_18.04 C_COMPILER=clang CXX_COMPILER=clang++ TARGET_ARCH=x86_64 Z3_BUILD_TYPE=RelWithDebInfo ASAN_BUILD=1 RUN_UNIT_TESTS=BUILD_AND_RUN UBSAN_BUILD=1 RUN_API_EXAMPLES=0 RUN_SYSTEM_TESTS=0 DOTNET_BINDINGS=0 JAVA_BINDINGS=0 PYTHON_BINDINGS=0 # gcc - - LINUX_BASE=ubuntu_18.04 C_COMPILER=gcc CXX_COMPILER=g++ TARGET_ARCH=x86_64 Z3_BUILD_TYPE=Release UBSAN_BUILD=1 RUN_UNIT_TESTS=BUILD_AND_RUN + # ubsan/msan builds too slow + - LINUX_BASE=ubuntu_18.04 C_COMPILER=gcc CXX_COMPILER=g++ TARGET_ARCH=x86_64 Z3_BUILD_TYPE=Release RUN_UNIT_TESTS=BUILD_AND_RUN - LINUX_BASE=ubuntu_18.04 C_COMPILER=gcc CXX_COMPILER=g++ TARGET_ARCH=x86_64 Z3_BUILD_TYPE=Debug RUN_UNIT_TESTS=BUILD_AND_RUN - # 18.04's gcc asan lib doesn't support pthread_atfork. TODO: enable for ubuntu 20.04 - #- LINUX_BASE=ubuntu_18.04 C_COMPILER=gcc CXX_COMPILER=g++ TARGET_ARCH=x86_64 Z3_BUILD_TYPE=Debug ASAN_BUILD=1 RUN_UNIT_TESTS=BUILD_AND_RUN - # Both of the two configurations below build the docs because the current - # implementation uses python as part of the building process. - # TODO: Teach one of the configurations to upload built docs somewhere. + # GMP library + - LINUX_BASE=ubuntu_18.04 C_COMPILER=gcc CXX_COMPILER=g++ TARGET_ARCH=x86_64 Z3_BUILD_TYPE=Release USE_LIBGMP=1 RUN_UNIT_TESTS=BUILD_AND_RUN + - LINUX_BASE=ubuntu_18.04 C_COMPILER=gcc CXX_COMPILER=g++ TARGET_ARCH=x86_64 Z3_BUILD_TYPE=Debug USE_LIBGMP=1 RUN_UNIT_TESTS=BUILD_AND_RUN + # Test with Python 3 and API docs - - LINUX_BASE=ubuntu_18.04 PYTHON_EXECUTABLE=/usr/bin/python3 BUILD_DOCS=1 - # Test with LibGMP and API docs - - LINUX_BASE=ubuntu_18.04 TARGET_ARCH=x86_64 USE_LIBGMP=1 BUILD_DOCS=1 PYTHON_EXECUTABLE=/usr/bin/python2.7 + - LINUX_BASE=ubuntu_18.04 BUILD_DOCS=1 # Unix Makefile generator build - LINUX_BASE=ubuntu_18.04 TARGET_ARCH=x86_64 Z3_CMAKE_GENERATOR="Unix Makefiles" diff --git a/contrib/ci/Dockerfiles/z3_base_ubuntu_18.04.Dockerfile b/contrib/ci/Dockerfiles/z3_base_ubuntu_18.04.Dockerfile index f13571ed15b..bb93b7d472c 100644 --- a/contrib/ci/Dockerfiles/z3_base_ubuntu_18.04.Dockerfile +++ b/contrib/ci/Dockerfiles/z3_base_ubuntu_18.04.Dockerfile @@ -14,8 +14,6 @@ RUN apt-get update && \ graphviz \ python3 \ python3-setuptools \ - python2.7 \ - python-setuptools \ sudo RUN curl -SL https://packages.microsoft.com/config/ubuntu/16.04/packages-microsoft-prod.deb --output packages-microsoft-prod.deb && \