aboutsummaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorcypherpunks <cypherpunks@torproject.org>2018-09-25 18:41:19 +0000
committercypherpunks <cypherpunks@torproject.org>2018-09-25 18:43:23 +0000
commitfcbbcf92cbd9e59b336a93c4e877eed55344de18 (patch)
tree678f634ff47f2625bdf2abd7db8462b9f2c8acee /.travis.yml
parentc82163dff468443d28b6d0c9b1253f7721eb3fdc (diff)
downloadtor-fcbbcf92cbd9e59b336a93c4e877eed55344de18.tar.gz
tor-fcbbcf92cbd9e59b336a93c4e877eed55344de18.zip
add --enable-nss build to Travis CI
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml5
1 files changed, 4 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 34b7595eb3..1af7d5bbdd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,6 +57,8 @@ matrix:
## Check disable module dirauth with and without rust
- env: MODULES_OPTIONS="--disable-module-dirauth" RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true HARDENING_OPTIONS=""
- env: MODULES_OPTIONS="--disable-module-dirauth"
+ ## Check NSS
+ - env: NSS_OPTIONS="--enable-nss"
## Uncomment to allow the build to report success (with non-required
## sub-builds continuing to run) if all required sub-builds have
@@ -118,6 +120,7 @@ addons:
## Optional dependencies
- libcap-dev
- liblzma-dev
+ - libnss3-dev
- libscrypt-dev
- libseccomp-dev
## zstd doesn't exist in Ubuntu Trusty
@@ -186,7 +189,7 @@ install:
script:
- ./autogen.sh
- - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $MODULES_OPTIONS $OPENSSL_OPTIONS $RUST_OPTIONS --enable-fatal-warnings --disable-silent-rules"
+ - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $MODULES_OPTIONS $NSS_OPTIONS $OPENSSL_OPTIONS $RUST_OPTIONS --enable-fatal-warnings --disable-silent-rules"
- echo "Configure flags are $CONFIGURE_FLAGS"
- ./configure $CONFIGURE_FLAGS
## We run `make check` because that's what https://jenkins.torproject.org does.