From 106efe58ce7b79b8df9c03cc097a51080c9636a8 Mon Sep 17 00:00:00 2001 From: rhysd Date: Tue, 7 Jan 2020 15:19:44 +0900 Subject: [PATCH 1/4] fix nighly and beta on CI are failing we always use stable rustfmt so checking with nighly/beta rustfmt is not necessary. --- .travis.yml | 5 ++++- appveyor.yml | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a1cc380..5215896 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,10 @@ before_script: script: - cargo build --all --locked --verbose - cargo test --all --locked --verbose - - cargo fmt --all -- --check + - | + if [[ "$TRAVIS_RUST_VERSION" == "stable" ]]; then + cargo fmt --all -- --check + fi jobs: allow_failures: diff --git a/appveyor.yml b/appveyor.yml index adf84e2..d15c249 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -128,4 +128,3 @@ build: false # environment variable. test_script: - cargo test --verbose %cargoflags% - - cargo fmt --all -- --check From 9783b96524cad74dcaf8f70f88cb2d5ab14ce471 Mon Sep 17 00:00:00 2001 From: rhysd Date: Tue, 7 Jan 2020 15:22:39 +0900 Subject: [PATCH 2/4] check beta channel on CI not to break this crate with next Rust version --- .travis.yml | 1 - appveyor.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5215896..ee8069e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,6 +25,5 @@ script: jobs: allow_failures: - - rust: beta - rust: nightly fast_finish: true diff --git a/appveyor.yml b/appveyor.yml index d15c249..aa0b3b1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -94,7 +94,6 @@ environment: # or test failure in the matching channels/targets from failing the entire build. matrix: allow_failures: - - channel: beta - channel: nightly # If you only care about stable channel build failures, uncomment the following line: From 9d14b6dfea823cae415f0f6725e5f02bf87ed603 Mon Sep 17 00:00:00 2001 From: rhysd Date: Tue, 7 Jan 2020 15:23:19 +0900 Subject: [PATCH 3/4] rename appveyor.yml to .appveyor.yml align to .travis.yml --- appveyor.yml => .appveyor.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename appveyor.yml => .appveyor.yml (100%) diff --git a/appveyor.yml b/.appveyor.yml similarity index 100% rename from appveyor.yml rename to .appveyor.yml From f93646e17a95308834471b3258cae77410858691 Mon Sep 17 00:00:00 2001 From: rhysd Date: Tue, 7 Jan 2020 17:31:36 +0900 Subject: [PATCH 4/4] ignore beta channel again on AppVeyor since rustc command crashes on combination of channel=beta & target=i686-pc-windows-gnu --- .appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.appveyor.yml b/.appveyor.yml index aa0b3b1..12c88c3 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -95,6 +95,7 @@ environment: matrix: allow_failures: - channel: nightly + - channel: beta # If you only care about stable channel build failures, uncomment the following line: #- channel: beta