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

Merge branch 'maint-0.3.4' into release-0.3.4

Browse Source
This commit is contained in:
Nick Mathewson 2018-07-02 13:38:47 -04:00
commit 788c443086
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.travis.yml
View File

@ -60,6 +60,7 @@ env:
global: global:
## The Travis CI environment allows us two cores, so let's use both. ## The Travis CI environment allows us two cores, so let's use both.
- MAKEFLAGS="-j 2" - MAKEFLAGS="-j 2"
- HARDENING_OPTIONS="--enable-fragile-hardening"
matrix: matrix:
## Leave at least one entry here or Travis seems to generate a ## Leave at least one entry here or Travis seems to generate a
## matrix entry with empty matrix environment variables. Leaving ## matrix entry with empty matrix environment variables. Leaving
@ -109,6 +110,10 @@ matrix:
env: DISTCHECK="yes" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" env: DISTCHECK="yes" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode"
- compiler: gcc - compiler: gcc
env: MODULES_OPTIONS="--disable-module-dirauth" env: MODULES_OPTIONS="--disable-module-dirauth"
- compiler: gcc
env: HARDENING_OPTIONS="" RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true
- compiler: gcc
env: DISTCHECK="yes" HARDENING_OPTIONS="" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode"
## The "sudo: required" forces non-containerized builds, working ## The "sudo: required" forces non-containerized builds, working
## around a Travis CI environment issue: clang LeakAnalyzer fails ## around a Travis CI environment issue: clang LeakAnalyzer fails
## because it requires ptrace and the containerized environment no ## because it requires ptrace and the containerized environment no
@ -154,10 +159,10 @@ install:
script: script:
- ./autogen.sh - ./autogen.sh
- ./configure $RUST_OPTIONS $COVERAGE_OPTIONS $MODULES_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules --enable-fragile-hardening - ./configure $RUST_OPTIONS $COVERAGE_OPTIONS $MODULES_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules $HARDENING_OPTIONS
## 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.
- if [[ "$DISTCHECK" == "" ]]; then make check; fi - if [[ "$DISTCHECK" == "" ]]; then make check; fi
- if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$RUST_OPTIONS $COVERAGE_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules --enable-fragile-hardening"; fi - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$RUST_OPTIONS $COVERAGE_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules $HARDENING_OPTIONS"; fi
after_failure: after_failure:
## `make check` will leave a log file with more details of test failures. ## `make check` will leave a log file with more details of test failures.