nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.5'

Browse Source
This commit is contained in:
Nick Mathewson 2018-10-24 08:57:28 -04:00
commit 3dc5cce749
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@ -57,6 +57,8 @@ matrix:
## Check disable module dirauth with and without rust ## 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" RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true HARDENING_OPTIONS=""
- env: MODULES_OPTIONS="--disable-module-dirauth" - env: MODULES_OPTIONS="--disable-module-dirauth"
## Check NSS
- env: NSS_OPTIONS="--enable-nss"
## Uncomment to allow the build to report success (with non-required ## Uncomment to allow the build to report success (with non-required
## sub-builds continuing to run) if all required sub-builds have ## sub-builds continuing to run) if all required sub-builds have
@ -121,6 +123,7 @@ addons:
## Optional dependencies ## Optional dependencies
- libcap-dev - libcap-dev
- liblzma-dev - liblzma-dev
- libnss3-dev
- libscrypt-dev - libscrypt-dev
- libseccomp-dev - libseccomp-dev
## zstd doesn't exist in Ubuntu Trusty ## zstd doesn't exist in Ubuntu Trusty
@ -195,7 +198,7 @@ install:
script: script:
- ./autogen.sh - ./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" - echo "Configure flags are $CONFIGURE_FLAGS"
- ./configure $CONFIGURE_FLAGS - ./configure $CONFIGURE_FLAGS
## We run `make check` because that's what https://jenkins.torproject.org does. ## We run `make check` because that's what https://jenkins.torproject.org does.

2
changes/ticket27751 Normal file
View File

@ -0,0 +1,2 @@
o Minor features (continuous integration):
- Add a Travis CI build for --enable-nss on Linux gcc. Closes ticket 27751.