Merge pull request #127 from japaric/mac32

travis: test/release on/for i686-apple-darwin
This commit is contained in:
Mathieu David 2016-04-04 19:23:36 +02:00
commit c071406fef
2 changed files with 10 additions and 11 deletions

View File

@ -9,10 +9,9 @@ env:
matrix:
include:
# Stable channel
# TODO re-enable the i686-apple-darwin target when passcod/rsnotify#53 is fixed
#- os: osx
#env: TARGET=i686-apple-darwin
#rust: stable
- os: osx
env: TARGET=i686-apple-darwin
rust: stable
- os: linux
env: TARGET=i686-unknown-linux-gnu
rust: stable
@ -35,9 +34,9 @@ matrix:
env: TARGET=x86_64-unknown-linux-musl
rust: stable
# Beta channel
#- os: osx
#env: TARGET=i686-apple-darwin
#rust: beta
- os: osx
env: TARGET=i686-apple-darwin
rust: beta
- os: linux
env: TARGET=i686-unknown-linux-gnu
rust: beta
@ -54,9 +53,9 @@ matrix:
env: TARGET=x86_64-unknown-linux-musl
rust: beta
# Nightly channel
#- os: osx
#env: TARGET=i686-apple-darwin
#rust: nightly
- os: osx
env: TARGET=i686-apple-darwin
rust: nightly
- os: linux
env: TARGET=i686-unknown-linux-gnu
rust: nightly

View File

@ -21,7 +21,7 @@ rustc-serialize = "0.3.18"
pulldown-cmark = "0.0.7"
# Watch feature
notify = { version = "2.5.4", optional = true }
notify = { version = "2.5.5", optional = true }
time = { version = "0.1.34", optional = true }
crossbeam = { version = "0.2.8", optional = true }