Skip to content

Commit c071406

Browse files
committed
Merge pull request #127 from japaric/mac32
travis: test/release on/for i686-apple-darwin
2 parents c3564f1 + 807a2f1 commit c071406

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

.travis.yml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@ env:
99
matrix:
1010
include:
1111
# Stable channel
12-
# TODO re-enable the i686-apple-darwin target when passcod/rsnotify#53 is fixed
13-
#- os: osx
14-
#env: TARGET=i686-apple-darwin
15-
#rust: stable
12+
- os: osx
13+
env: TARGET=i686-apple-darwin
14+
rust: stable
1615
- os: linux
1716
env: TARGET=i686-unknown-linux-gnu
1817
rust: stable
@@ -35,9 +34,9 @@ matrix:
3534
env: TARGET=x86_64-unknown-linux-musl
3635
rust: stable
3736
# Beta channel
38-
#- os: osx
39-
#env: TARGET=i686-apple-darwin
40-
#rust: beta
37+
- os: osx
38+
env: TARGET=i686-apple-darwin
39+
rust: beta
4140
- os: linux
4241
env: TARGET=i686-unknown-linux-gnu
4342
rust: beta
@@ -54,9 +53,9 @@ matrix:
5453
env: TARGET=x86_64-unknown-linux-musl
5554
rust: beta
5655
# Nightly channel
57-
#- os: osx
58-
#env: TARGET=i686-apple-darwin
59-
#rust: nightly
56+
- os: osx
57+
env: TARGET=i686-apple-darwin
58+
rust: nightly
6059
- os: linux
6160
env: TARGET=i686-unknown-linux-gnu
6261
rust: nightly

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ rustc-serialize = "0.3.18"
2121
pulldown-cmark = "0.0.7"
2222

2323
# Watch feature
24-
notify = { version = "2.5.4", optional = true }
24+
notify = { version = "2.5.5", optional = true }
2525
time = { version = "0.1.34", optional = true }
2626
crossbeam = { version = "0.2.8", optional = true }
2727

0 commit comments

Comments
 (0)