diff --git a/.travis.yml b/.travis.yml index c243f3f6..77820b44 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,26 +9,6 @@ env: matrix: include: - # Stable channel - - os: osx - env: TARGET=i686-apple-darwin CHANNEL=stable - - os: linux - env: TARGET=i686-unknown-linux-gnu CHANNEL=stable - addons: - apt: - packages: &i686_unknown_linux_gnu - - gcc-multilib - - os: osx - env: TARGET=x86_64-apple-darwin CHANNEL=stable - - os: linux - env: TARGET=x86_64-unknown-linux-gnu CHANNEL=stable - addons: - apt: - packages: - - nodejs - - npm - - os: linux - env: TARGET=x86_64-unknown-linux-musl CHANNEL=stable # Beta channel - os: osx env: TARGET=i686-apple-darwin CHANNEL=beta @@ -58,6 +38,28 @@ matrix: - os: linux env: TARGET=x86_64-unknown-linux-musl CHANNEL=nightly + # Not testing on stable channel until proc_macro lands there in the next release. + # # Stable channel + # - os: osx + # env: TARGET=i686-apple-darwin CHANNEL=stable + # - os: linux + # env: TARGET=i686-unknown-linux-gnu CHANNEL=stable + # addons: + # apt: + # packages: &i686_unknown_linux_gnu + # - gcc-multilib + # - os: osx + # env: TARGET=x86_64-apple-darwin CHANNEL=stable + # - os: linux + # env: TARGET=x86_64-unknown-linux-gnu CHANNEL=stable + # addons: + # apt: + # packages: + # - nodejs + # - npm + # - os: linux + # env: TARGET=x86_64-unknown-linux-musl CHANNEL=stable + # Musl builds fail due to a bug in Rust (https://github.com/azerupi/mdBook/issues/158) allow_failures: - os: linux diff --git a/appveyor.yml b/appveyor.yml index 87da24ce..1f17eb7b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,11 +2,6 @@ environment: global: PROJECT_NAME: mdBook matrix: - # Stable channel - - TARGET: i686-pc-windows-msvc - RUST_CHANNEL: stable - - TARGET: x86_64-pc-windows-msvc - RUST_CHANNEL: stable # Beta channel - TARGET: i686-pc-windows-msvc RUST_CHANNEL: beta @@ -18,6 +13,13 @@ environment: - TARGET: x86_64-pc-windows-msvc RUST_CHANNEL: nightly +# Not testing on stable channel until proc_macro lands there in the next release. +# # Stable channel +# - TARGET: i686-pc-windows-msvc +# RUST_CHANNEL: stable +# - TARGET: x86_64-pc-windows-msvc +# RUST_CHANNEL: stable + # Install Rust and Cargo install: - ps: Start-FileDownload "https://static.rust-lang.org/dist/channel-rust-stable"