summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Dockerfile1
-rw-r--r--shippable.yml1
2 files changed, 2 insertions, 0 deletions
diff --git a/Dockerfile b/Dockerfile
index 76b134003..35db15863 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,5 +7,6 @@ RUN sed -i s#://deb.debian.org#://cdn-fastly.deb.debian.org# /etc/apt/sources.li
&& env DEBIAN_FRONTEND=noninteractive apt-get install build-essential ccache ninja-build expect curl git -q -y \
&& env DEBIAN_FRONTEND=noninteractive ./prepare-release travis-ci \
&& dpkg-reconfigure ccache \
+ && rm -f /etc/dpkg/dpkg.cfg.d/excludes \
&& rm -r /tmp/* \
&& apt-get clean
diff --git a/shippable.yml b/shippable.yml
index 0091b95ea..5aafda9cf 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -11,5 +11,6 @@ build:
- mkdir build
- ( cd build && cmake -DWITH_CURL=OFF .. )
- make -C build -j 4
+ - rm -f /etc/dpkg/dpkg.cfg.d/excludes
- CTEST_OUTPUT_ON_FAILURE=1 make -C build test
- unbuffer ./test/integration/run-tests -q -j 4