summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-07-02 12:22:37 -0400
committerNick Mathewson <nickm@torproject.org>2018-07-02 12:22:37 -0400
commitd6aa6549b54a52e7c67d0f1409a3696af450f341 (patch)
treefdaedf20d6208b2c9eeaa2e895780e0d790f923a
parentd88ce331ef0d25a1db279d3ba7c952fbb63eabe7 (diff)
parentf028713d37053ca4e56b194e7ff7e682e8ef7d37 (diff)
downloadtor-d6aa6549b54a52e7c67d0f1409a3696af450f341.tar.gz
tor-d6aa6549b54a52e7c67d0f1409a3696af450f341.zip
Merge remote-tracking branch 'catalyst-github/moar-libs'
-rw-r--r--.travis.yml3
-rw-r--r--changes/ticket265603
2 files changed, 5 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index f37f9a23ff..bf2887b3ef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,11 +42,12 @@ addons:
packages:
## Required dependencies
- libevent-dev
- - libseccomp2
- zlib1g-dev
## Optional dependencies
+ - libcap-dev
- liblzma-dev
- libscrypt-dev
+ - libseccomp-dev
## zstd doesn't exist in Ubuntu Trusty
#- libzstd
diff --git a/changes/ticket26560 b/changes/ticket26560
new file mode 100644
index 0000000000..5b4fb1bfe7
--- /dev/null
+++ b/changes/ticket26560
@@ -0,0 +1,3 @@
+ o Minor features (continuous integration):
+ - Install libcap-dev and libseccomp2-dev so these optional
+ dependencies get tested on Travis CI. Closes ticket 26560.