Merge pull request #52 from hobofan/chore/reactivate_linux_ci

Reactivate linux CI
hobofan · Jan 8, 2020 · d8386e0 · d8386e0
2 parents 8c58dab + 95868e9
commit d8386e0
Show file tree

Hide file tree

Showing 3 changed files with 112 additions and 112 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -34,8 +34,7 @@ matrix:
     # - env: TARGET=powerpc64-unknown-linux-gnu
     # - env: TARGET=powerpc64le-unknown-linux-gnu
     # - env: TARGET=s390x-unknown-linux-gnu DISABLE_TESTS=1
-    # Until issue #37 is fixed, disable linux targets
-    # - env: TARGET=x86_64-unknown-linux-gnu
+    - env: TARGET=x86_64-unknown-linux-gnu
     # - env: TARGET=x86_64-unknown-linux-musl
 
     # OSX
@@ -61,10 +60,8 @@ matrix:
     # - env: TARGET=thumbv7m-none-eabi
 
     # Testing other channels
-    # Until issue #37 is fixed, disable linux targets.
-    # Test failed CI due to file locking error, try again
-    #- env: TARGET=x86_64-unknown-linux-gnu
-    #  rust: nightly
+    - env: TARGET=x86_64-unknown-linux-gnu
+      rust: nightly
     - env: TARGET=x86_64-apple-darwin
       os: osx
       rust: nightly