aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGertjan van den Burg <gertjanvandenburg@gmail.com>2020-08-19 00:09:47 +0100
committerGertjan van den Burg <gertjanvandenburg@gmail.com>2020-08-19 00:09:47 +0100
commitc01ab27177d11bb0b0bbd1fe62e319425f30561a (patch)
tree9d411bdc3601f4f5ca4b9edcfb55461d0e331ae1
parentMerge branch 'jayschauer-master' into master (diff)
parentTest building the virtualenvs on Travis (diff)
downloadTCPDBench-c01ab27177d11bb0b0bbd1fe62e319425f30561a.tar.gz
TCPDBench-c01ab27177d11bb0b0bbd1fe62e319425f30561a.zip
Merge branch 'feature/travis_venv' into master
-rw-r--r--.travis.yml14
-rw-r--r--Dockerfile2
2 files changed, 11 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 2a422bdc..58202c03 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,14 @@ before_install:
script:
- mkdir -p /home/travis/build/alan-turing-institute/analysis/output
- # create results (tables/figures) in the docker container
- # note that we consider the build successful if there is no difference
- # between the results in the repo and that generated by travis. An exception
- # are the pdf files, which often differ due to different latex versions etc.
+ # create results (tables/figures) in the docker container note that we
+ # consider the build successful if there is no difference between the
+ # results in the repo and that generated by travis. An exception are the
+ # pdf files, which often differ due to different latex versions etc.
- docker run -v /home/travis/build/alan-turing-institute/analysis/output:/TCPDBench/analysis/output alan-turing-institute/tcpdbench /bin/bash -c "make clean && make results && git checkout ./analysis/output/rankplots/*.pdf && git diff --exit-code"
+ # Test that the virtual environments can be created. The virtualenvs are
+ # needed to run the experiments using the same package versions as used in
+ # the paper. Since these may depend on external (third-party) packages,
+ # they can potentially be fragile to unexpected changes, so we want to
+ # make sure we're notified when they no longer build correctly.
+ - docker run alan-turing-institute/tcpdbench /bin/bash -c "make venvs"
diff --git a/Dockerfile b/Dockerfile
index 7bc02564..8ecc12a6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,6 +8,7 @@ RUN apt-get update && \
build-essential \
r-base \
r-base-dev \
+ r-cran-rcppeigen \
latexmk \
texlive-latex-extra \
libopenmpi-dev \
@@ -20,7 +21,6 @@ RUN apt-get update && \
libfreetype6-dev \
libv8-dev
-
# Make sure python means python3
RUN apt-get install -y --no-install-recommends \
python3 \