Prechádzať zdrojové kódy

Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.4.0

Nick Mathewson 5 rokov pred
rodič
commit
c8447f95ec
2 zmenil súbory, kde vykonal 7 pridanie a 0 odobranie
  1. 4 0
      .travis.yml
  2. 3 0
      changes/bug30744

+ 4 - 0
.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

+ 3 - 0
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.