diff options
| author | teor <teor@torproject.org> | 2019-06-11 14:51:46 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-06-11 14:51:46 +1000 |
| commit | dcb8cad4e65022820c1660838e72b5b5ea67f850 (patch) | |
| tree | 82d8ec0c28a6e8c87a49a6c0c89df40185231756 | |
| parent | a742a80eeaf12e238c5b2e9eb06d8edbc8797c2b (diff) | |
| parent | d761c3ca6de62ecdced9933a0717bf3ee598b073 (diff) | |
| download | tor-dcb8cad4e65022820c1660838e72b5b5ea67f850.tar.gz tor-dcb8cad4e65022820c1660838e72b5b5ea67f850.zip | |
Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.3.5
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | changes/bug30744 | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 3c0a3a02a8..861b37f085 100644 --- a/.travis.yml +++ b/.travis.yml @@ -70,6 +70,10 @@ 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-allow_failures + allow_failures: + ## test-stem sometimes hangs on Travis + - env: TEST_STEM="yes" + exclude: ## gcc on OSX is less useful, because the default compiler is clang. - compiler: gcc diff --git a/changes/bug30744 b/changes/bug30744 new file mode 100644 index 0000000000..9f07d4855f --- /dev/null +++ b/changes/bug30744 @@ -0,0 +1,3 @@ + o Minor bugfixes (continuous integration): + - Allow the test-stem job to fail in Travis, because it sometimes hangs. + Fixes bug 30744; bugfix on 0.3.5.4-alpha. |