Skip to content

Commit 915ef4e

Browse files
authored
Support Ubuntu 18.04 (#6)
1 parent 7400318 commit 915ef4e

File tree

6 files changed

+65
-1
lines changed

6 files changed

+65
-1
lines changed

.travis.yml

+8
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,14 @@ env:
1515
# Configurations
1616
matrix:
1717
###############################################################################
18+
# Ubuntu 18.04 LTS
19+
###############################################################################
20+
# 64-bit default compilers Release
21+
- LINUX_BASE=ubuntu_18.04 C_COMPILER=/usr/bin/gcc-5 CXX_COMPILER=/usr/bin/g++-5 TARGET_ARCH=x86_64 Z3_BUILD_TYPE=Release JAVA_BINDINGS=1
22+
# 64-bit GCC 5.4 Debug
23+
- LINUX_BASE=ubuntu_18.04 C_COMPILER=/usr/bin/gcc-5 CXX_COMPILER=/usr/bin/g++-5 TARGET_ARCH=x86_64 Z3_BUILD_TYPE=Debug RUN_UNIT_TESTS=BUILD_ONLY
24+
25+
###############################################################################
1826
# Ubuntu 16.04 LTS
1927
###############################################################################
2028
# 64-bit default compilers Release

README.batfish

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ LINUX_BASE=ubuntu_14.04 TRAVIS_OS_NAME=linux contrib/ci/scripts/travis_ci_entry_
66
## Ubuntu 16,04 (USES DOCKER)
77
LINUX_BASE=ubuntu_16.04 TRAVIS_OS_NAME=linux contrib/ci/scripts/travis_ci_entry_point.sh
88

9+
## Ubuntu 18,04 (USES DOCKER)
10+
LINUX_BASE=ubuntu_18.04 TRAVIS_OS_NAME=linux contrib/ci/scripts/travis_ci_entry_point.sh
11+
912
### OSX
1013
# For all OSX builds as of Mojave, make sure you have installed SDK headers by executing:
1114
# open /Library/Developer/CommandLineTools/Packages/macOS_SDK_headers_for_macOS_10.14.pkg
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
FROM ubuntu:18.04
2+
3+
RUN apt-get update && \
4+
apt-get -y --no-install-recommends install \
5+
apt-transport-https \
6+
binutils \
7+
clang \
8+
clang-3.9 \
9+
cmake \
10+
curl \
11+
doxygen \
12+
default-jdk \
13+
gcc-multilib \
14+
gcc-5-multilib \
15+
git \
16+
graphviz \
17+
g++-multilib \
18+
g++-5-multilib \
19+
libgmp-dev \
20+
libgomp1 \
21+
libomp5 \
22+
libomp-dev \
23+
llvm-3.9 \
24+
lsb-release \
25+
make \
26+
ninja-build \
27+
python3 \
28+
python3-setuptools \
29+
python2.7 \
30+
python-setuptools \
31+
sudo \
32+
zip
33+
34+
RUN curl -SL https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb --output packages-microsoft-prod.deb && \
35+
dpkg -i packages-microsoft-prod.deb && \
36+
apt-get update && \
37+
apt-get -y --no-install-recommends install dotnet-sdk-2.1
38+
39+
# Create `user` user for container with password `user`. and give it
40+
# password-less sudo access
41+
RUN useradd -m user && \
42+
echo user:user | chpasswd && \
43+
cp /etc/sudoers /etc/sudoers.bak && \
44+
echo 'user ALL=(root) NOPASSWD: ALL' >> /etc/sudoers
45+
USER user
46+
WORKDIR /home/user
47+
ENV ASAN_SYMBOLIZER_PATH=/usr/lib/llvm-3.9/bin/llvm-symbolizer

contrib/ci/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ can be found in
6666

6767
#### Linux specific configuration variables
6868

69-
* `LINUX_BASE` - The base docker image identifier to use (`ubuntu_16.04`, `ubuntu32_16.04`, or `ubuntu_14.04`).
69+
* `LINUX_BASE` - The base docker image identifier to use (`ubuntu_18.04`, `ubuntu_16.04`, `ubuntu32_16.04`, or `ubuntu_14.04`).
7070

7171
#### Reproducing a build locally
7272

contrib/ci/scripts/travis_ci_linux_entry_point.sh

+4
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,10 @@ case ${LINUX_BASE} in
161161
BASE_DOCKER_FILE="${DOCKER_FILE_DIR}/z3_base_ubuntu_16.04.Dockerfile"
162162
BASE_DOCKER_IMAGE_NAME="z3_base_ubuntu:16.04"
163163
;;
164+
ubuntu_18.04)
165+
BASE_DOCKER_FILE="${DOCKER_FILE_DIR}/z3_base_ubuntu_18.04.Dockerfile"
166+
BASE_DOCKER_IMAGE_NAME="z3_base_ubuntu:18.04"
167+
;;
164168
*)
165169
echo "Unknown Linux base ${LINUX_BASE}"
166170
exit 1

scripts/mk_nuget_release.py

+2
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ def download_installs():
3939

4040
os_info = {"z64-ubuntu-14" : ('so', 'ubuntu.14.04-x64'),
4141
'ubuntu-16' : ('so', 'ubuntu-x64'),
42+
'ubuntu-18' : ('so', 'ubuntu.18.04-x64'),
4243
'x64-win' : ('dll', 'win-x64'),
4344
'x86-win' : ('dll', 'win-x86'),
4445
'osx' : ('dylib', 'macos'),
@@ -58,6 +59,7 @@ def unpack():
5859
# +- runtimes
5960
# +- win-x64
6061
# +- win-x86
62+
# +- ubuntu.18.04-x64
6163
# +- ubuntu.16.04-x64
6264
# +- ubuntu.14.04-x64
6365
# +- debian.8-x64

0 commit comments

Comments
 (0)