3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 00:55:31 +00:00

travis: switch to ubuntu 20.04

This commit is contained in:
Nuno Lopes 2021-02-20 18:42:37 +00:00
parent 7b6eff6967
commit 020e639917
3 changed files with 18 additions and 21 deletions

View file

@ -1,4 +1,4 @@
FROM ubuntu:18.04
FROM ubuntu:20.04
RUN apt-get update && \
apt-get -y --no-install-recommends install \
@ -14,11 +14,9 @@ RUN apt-get update && \
graphviz \
python3 \
python3-setuptools \
python2.7 \
python-setuptools \
sudo
RUN curl -SL https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb --output packages-microsoft-prod.deb && \
RUN curl -SL https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb --output packages-microsoft-prod.deb && \
dpkg -i packages-microsoft-prod.deb && \
apt-get update && \
apt-get -y --no-install-recommends install dotnet-sdk-2.1
@ -31,4 +29,4 @@ RUN useradd -m user && \
echo 'user ALL=(root) NOPASSWD: ALL' >> /etc/sudoers
USER user
WORKDIR /home/user
ENV ASAN_SYMBOLIZER_PATH=/usr/lib/llvm-7/bin/llvm-symbolizer
#ENV ASAN_SYMBOLIZER_PATH=/usr/lib/llvm-7/bin/llvm-symbolizer

View file

@ -141,9 +141,9 @@ if [ -n "${Z3_WARNINGS_AS_ERRORS}" ]; then
fi
case ${LINUX_BASE} in
ubuntu_18.04)
BASE_DOCKER_FILE="${DOCKER_FILE_DIR}/z3_base_ubuntu_18.04.Dockerfile"
BASE_DOCKER_IMAGE_NAME="z3_base_ubuntu:18.04"
ubuntu_20.04)
BASE_DOCKER_FILE="${DOCKER_FILE_DIR}/z3_base_ubuntu_20.04.Dockerfile"
BASE_DOCKER_IMAGE_NAME="z3_base_ubuntu:20.04"
;;
*)
echo "Unknown Linux base ${LINUX_BASE}"