about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-09-26 10:33:44 +0000
committerbors <bors@rust-lang.org>2019-09-26 10:33:44 +0000
commitb5600c9852c8141e38f994a8cd7a8b8b2def604f (patch)
treed17d888a44396cbc7bcdbad2db245bea4ea05f81
parent3335209059448178ed8426696326b40e70c836e5 (diff)
parent70f03dd41fa126e5f9d62cc0fd1c0203c868d5a0 (diff)
downloadrust-b5600c9852c8141e38f994a8cd7a8b8b2def604f.tar.gz
rust-b5600c9852c8141e38f994a8cd7a8b8b2def604f.zip
Auto merge of #4581 - Manishearth:osx-enable, r=matthiaskrgr
Re enable OSX builders

Fixes #4576

changelog: none
-rw-r--r--.travis.yml2
1 files changed, 0 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index b29b1362794..9c1d004d694 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -85,8 +85,6 @@ matrix:
   allow_failures:
     - os: windows
       env: CARGO_INCREMENTAL=0 BASE_TESTS=true OS_WINDOWS=true
-    - os: osx # run base tests on both platforms
-      env: BASE_TESTS=true
   # prevent these jobs with default env vars
   exclude:
     - os: linux