diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-10-24 08:57:22 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-10-24 08:57:22 -0400 |
| commit | 98e28efa8c2558e408313254c161a3ff9b371f27 (patch) | |
| tree | c07c070c4ee989917d71939039636b323aa45fcd /.travis.yml | |
| parent | 131ab9d5233a2f452c608bf85a39255903d036c1 (diff) | |
| parent | fcbbcf92cbd9e59b336a93c4e877eed55344de18 (diff) | |
| download | tor-98e28efa8c2558e408313254c161a3ff9b371f27.tar.gz tor-98e28efa8c2558e408313254c161a3ff9b371f27.zip | |
Merge branch 'nss-travis' into maint-0.3.5
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index de526fe0f3..ec1748e67b 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 @@ -121,6 +123,7 @@ addons: ## Optional dependencies - libcap-dev - liblzma-dev + - libnss3-dev - libscrypt-dev - libseccomp-dev ## zstd doesn't exist in Ubuntu Trusty @@ -195,7 +198,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. |