Skip to content
This repository was archived by the owner on Oct 23, 2023. It is now read-only.

Commit d41208b

Browse files
committed
Added Ubuntu 18.04 to the builds
1 parent df7419f commit d41208b

File tree

3 files changed

+34
-1
lines changed

3 files changed

+34
-1
lines changed

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ matrix:
77
include:
88
- env:
99
TOOLCHAIN=ubuntu16.04
10+
- env:
11+
TOOLCHAIN=ubuntu18.04
1012
- env:
1113
- TOOLCHAIN=archlinux
1214
# - os: osx

tools/compile_and_test.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,7 @@ else
2323
python3 build/python/setup.py develop
2424
( cd build && ctest -VV )
2525
# for some reason cmake gtest discovery is a bit bugged on ubuntu, manual execution for now
26-
( cd build/cpp && ./sandbox_unix_test --gtest_list_tests | tail -n +3 | xargs -I{} ./sandbox_unix_test --gtest_filter="UnixTest.{}" )
26+
if [ "$TOOLCHAIN" == "ubuntu16.04" ]; then
27+
( cd build/cpp && ./sandbox_unix_test --gtest_list_tests | tail -n +3 | xargs -I{} ./sandbox_unix_test --gtest_filter="UnixTest.{}" )
28+
fi
2729
fi

tools/ubuntu18.04/Dockerfile

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
FROM ubuntu:18.04
2+
MAINTAINER Edoardo Morassutto <[email protected]>
3+
4+
ENV CC=gcc CXX=g++
5+
6+
RUN mkdir -p /build
7+
8+
WORKDIR /build
9+
10+
# setup the system
11+
# yes, i feel guilty for "pip install", but it's only for the tests
12+
RUN apt update -y && \
13+
apt install -y g++ gcc git cmake make libdw-dev \
14+
python3 python3-setuptools python3-pip \
15+
python3-traits python3-ruamel.yaml \
16+
fpc rustc zip && \
17+
apt-get clean && \
18+
ln -sf $(which $CC) /usr/bin/cc && \
19+
ln -sf $(which $CXX) /usr/bin/c++ && \
20+
pip3 install pytest
21+
22+
RUN mkdir /hunter-root
23+
24+
# prebuild the hunter packages
25+
RUN git clone https://github.com/algorithm-ninja/task-maker /tmp/task-maker && \
26+
cd /tmp/task-maker && \
27+
cmake -H. -Bbuild -DHUNTER_ROOT=/hunter-root && \
28+
cd / && \
29+
rm -rf /tmp/task-maker

0 commit comments

Comments
 (0)