diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-06-20 20:00:56 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-06-20 20:00:56 -0400 |
| commit | 46dca273214147233808bcddb82c8bf76e8d6db5 (patch) | |
| tree | 239dba99cf7a47a2511863e11390483ef841d9f1 | |
| parent | f91ea506f0a9af55a520dab4c88abf0c01bd2ce1 (diff) | |
| parent | e23ff6d4cccf4597a6e537450a2f5d55fa376b84 (diff) | |
| download | tor-46dca273214147233808bcddb82c8bf76e8d6db5.tar.gz tor-46dca273214147233808bcddb82c8bf76e8d6db5.zip | |
Merge remote-tracking branch 'catalyst-github/allow_fail_rust' into maint-0.3.4
| -rw-r--r-- | .travis.yml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index aab6f6b3d5..f37f9a23ff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -87,8 +87,9 @@ matrix: ## branches and build history pages. See ## https://github.com/travis-ci/travis-ci/issues/8716 allow_failures: - # - env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true - # - env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode + - env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true + - env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" + - env: DISTCHECK="yes" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" # - compiler: clang ## Create explicit matrix entries to work around a Travis CI |