Skip to content

Commit 020e639

Browse files
committed
travis: switch to ubuntu 20.04
1 parent 7b6eff6 commit 020e639

File tree

3 files changed

+18
-21
lines changed

3 files changed

+18
-21
lines changed

.travis.yml

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,38 +15,37 @@ env:
1515
# Configurations
1616
matrix:
1717
###############################################################################
18-
# Ubuntu 18.04 LTS
18+
# Ubuntu 20.04 LTS
1919
###############################################################################
2020
# Note the unit tests for the debug builds are compiled but **not**
2121
# executed. This is because the debug build of unit tests takes a large
2222
# amount of time to execute compared to the optimized builds.
2323

2424
# clang
25-
#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
26-
- 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
27-
- 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
28-
- 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
25+
- LINUX_BASE=ubuntu_20.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
26+
- LINUX_BASE=ubuntu_20.04 C_COMPILER=clang CXX_COMPILER=clang++ TARGET_ARCH=x86_64 Z3_BUILD_TYPE=Release UBSAN_BUILD=1 RUN_UNIT_TESTS=BUILD_AND_RUN
27+
- LINUX_BASE=ubuntu_20.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
2928

3029
# gcc
3130
# ubsan/msan builds too slow
32-
- 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
33-
- 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
31+
- LINUX_BASE=ubuntu_20.04 C_COMPILER=gcc CXX_COMPILER=g++ TARGET_ARCH=x86_64 Z3_BUILD_TYPE=Release UBSAN_BUILD=1 RUN_UNIT_TESTS=BUILD_AND_RUN
32+
- LINUX_BASE=ubuntu_20.04 C_COMPILER=gcc CXX_COMPILER=g++ TARGET_ARCH=x86_64 Z3_BUILD_TYPE=Debug RUN_UNIT_TESTS=BUILD_AND_RUN
3433

3534
# GMP library
36-
- 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
37-
- 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
35+
- LINUX_BASE=ubuntu_20.04 C_COMPILER=gcc CXX_COMPILER=g++ TARGET_ARCH=x86_64 Z3_BUILD_TYPE=Release USE_LIBGMP=1 RUN_UNIT_TESTS=BUILD_AND_RUN
36+
- LINUX_BASE=ubuntu_20.04 C_COMPILER=gcc CXX_COMPILER=g++ TARGET_ARCH=x86_64 Z3_BUILD_TYPE=Debug USE_LIBGMP=1 RUN_UNIT_TESTS=BUILD_AND_RUN
3837

3938
# Test with Python 3 and API docs
40-
- LINUX_BASE=ubuntu_18.04 BUILD_DOCS=1
39+
- LINUX_BASE=ubuntu_20.04 BUILD_DOCS=1
4140

4241
# Unix Makefile generator build
43-
- LINUX_BASE=ubuntu_18.04 TARGET_ARCH=x86_64 Z3_CMAKE_GENERATOR="Unix Makefiles"
42+
- LINUX_BASE=ubuntu_20.04 TARGET_ARCH=x86_64 Z3_CMAKE_GENERATOR="Unix Makefiles"
4443

4544
# LTO build
46-
- LINUX_BASE=ubuntu_18.04 TARGET_ARCH=x86_64 USE_LTO=1
45+
- LINUX_BASE=ubuntu_20.04 TARGET_ARCH=x86_64 USE_LTO=1
4746

4847
# Static build. Note we have disable building the bindings because they won't work with a static libz3
49-
- LINUX_BASE=ubuntu_18.04 TARGET_ARCH=x86_64 Z3_STATIC_BUILD=1 DOTNET_BINDINGS=0 JAVA_BINDINGS=0 PYTHON_BINDINGS=0
48+
- LINUX_BASE=ubuntu_20.04 TARGET_ARCH=x86_64 Z3_STATIC_BUILD=1 DOTNET_BINDINGS=0 JAVA_BINDINGS=0 PYTHON_BINDINGS=0
5049

5150

5251
script:

contrib/ci/Dockerfiles/z3_base_ubuntu_18.04.Dockerfile renamed to contrib/ci/Dockerfiles/z3_base_ubuntu_20.04.Dockerfile

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:18.04
1+
FROM ubuntu:20.04
22

33
RUN apt-get update && \
44
apt-get -y --no-install-recommends install \
@@ -14,11 +14,9 @@ RUN apt-get update && \
1414
graphviz \
1515
python3 \
1616
python3-setuptools \
17-
python2.7 \
18-
python-setuptools \
1917
sudo
2018

21-
RUN curl -SL https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb --output packages-microsoft-prod.deb && \
19+
RUN curl -SL https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb --output packages-microsoft-prod.deb && \
2220
dpkg -i packages-microsoft-prod.deb && \
2321
apt-get update && \
2422
apt-get -y --no-install-recommends install dotnet-sdk-2.1
@@ -31,4 +29,4 @@ RUN useradd -m user && \
3129
echo 'user ALL=(root) NOPASSWD: ALL' >> /etc/sudoers
3230
USER user
3331
WORKDIR /home/user
34-
ENV ASAN_SYMBOLIZER_PATH=/usr/lib/llvm-7/bin/llvm-symbolizer
32+
#ENV ASAN_SYMBOLIZER_PATH=/usr/lib/llvm-7/bin/llvm-symbolizer

contrib/ci/scripts/travis_ci_linux_entry_point.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,9 @@ if [ -n "${Z3_WARNINGS_AS_ERRORS}" ]; then
141141
fi
142142

143143
case ${LINUX_BASE} in
144-
ubuntu_18.04)
145-
BASE_DOCKER_FILE="${DOCKER_FILE_DIR}/z3_base_ubuntu_18.04.Dockerfile"
146-
BASE_DOCKER_IMAGE_NAME="z3_base_ubuntu:18.04"
144+
ubuntu_20.04)
145+
BASE_DOCKER_FILE="${DOCKER_FILE_DIR}/z3_base_ubuntu_20.04.Dockerfile"
146+
BASE_DOCKER_IMAGE_NAME="z3_base_ubuntu:20.04"
147147
;;
148148
*)
149149
echo "Unknown Linux base ${LINUX_BASE}"

0 commit comments

Comments
 (0)