commit dcb8cad4e65022820c1660838e72b5b5ea67f850 Merge: a742a80ee d761c3ca6 Author: teor teor@torproject.org Date: Tue Jun 11 14:51:46 2019 +1000
Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.3.5
.travis.yml | 4 ++++ changes/bug30744 | 3 +++ 2 files changed, 7 insertions(+)
diff --cc .travis.yml index 3c0a3a02a,a1a48baff..861b37f08 --- a/.travis.yml +++ b/.travis.yml @@@ -70,7 -70,17 +70,11 @@@ matrix ## Careful! We use global envs, which makes it hard to exclude or ## allow failures by env: ## https://docs.travis-ci.com/user/customizing-the-build#matching-jobs-with-all... + allow_failures: + ## test-stem sometimes hangs on Travis + - env: TEST_STEM="yes" + exclude: - ## Clang doesn't work in containerized builds, see below. - - compiler: clang - sudo: false - ## Non-containerized gcc are slow and redundant. - - compiler: gcc - sudo: required ## gcc on OSX is less useful, because the default compiler is clang. - compiler: gcc os: osx