From f2be732ec726e17fe032654e5185379d836de55b Mon Sep 17 00:00:00 2001 From: Bradlee Speice Date: Sat, 8 Dec 2018 19:17:21 -0500 Subject: [PATCH 1/7] One more travis script issue --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8bcd8da..f14bcda 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,7 +42,7 @@ install: - source ~/.cargo/env || true script: - - if [ "$TRAVIS_RUST_VERSION" == "nightly" ]; then + - if [ "$TRAVIS_RUST_VERSION" = "nightly" ]; then rustup component add rustfmt-preview else rustup component add rustfmt From 2b84ecda9d4b7c5be95873ca658e74d76255e4db Mon Sep 17 00:00:00 2001 From: Bradlee Speice Date: Sat, 8 Dec 2018 19:21:34 -0500 Subject: [PATCH 2/7] Move the rustfmt install --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f14bcda..60b9857 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,13 +40,13 @@ before_install: install: - source ~/.cargo/env || true - -script: - - if [ "$TRAVIS_RUST_VERSION" = "nightly" ]; then + - if [ "$TRAVIS_RUST_VERSION" == "nightly" ]; then rustup component add rustfmt-preview else rustup component add rustfmt fi + +script: - cargo fmt --all -- --check - | if [ -z "$TRAVIS_TAG" ]; then From b31491dfbcb91b05b28db03773e79e7071ea8454 Mon Sep 17 00:00:00 2001 From: Bradlee Speice Date: Sat, 8 Dec 2018 19:27:03 -0500 Subject: [PATCH 3/7] Run as a script block --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 60b9857..2b6b22b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,8 @@ before_install: install: - source ~/.cargo/env || true - - if [ "$TRAVIS_RUST_VERSION" == "nightly" ]; then + - | + if [ "$TRAVIS_RUST_VERSION" == "nightly" ]; then rustup component add rustfmt-preview else rustup component add rustfmt From c14a26baaf6da65548ecbde174a4b79fda63f785 Mon Sep 17 00:00:00 2001 From: Bradlee Speice Date: Sat, 8 Dec 2018 19:33:00 -0500 Subject: [PATCH 4/7] Log out the RUST_VERSION --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 2b6b22b..98c7776 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,6 +41,7 @@ before_install: install: - source ~/.cargo/env || true - | + echo "TRAVIS_RUST_VERSION:$TRAVIS_RUST_VERSION" if [ "$TRAVIS_RUST_VERSION" == "nightly" ]; then rustup component add rustfmt-preview else From 68e9f97b2b97a5236577598384dba3b6cdf52328 Mon Sep 17 00:00:00 2001 From: Bradlee Speice Date: Sat, 8 Dec 2018 19:39:32 -0500 Subject: [PATCH 5/7] Seriously? --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 98c7776..0c4ade2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,10 +41,12 @@ before_install: install: - source ~/.cargo/env || true - | - echo "TRAVIS_RUST_VERSION:$TRAVIS_RUST_VERSION" + echo "TRAVIS_RUST_VERSION=\"$TRAVIS_RUST_VERSION\"" if [ "$TRAVIS_RUST_VERSION" == "nightly" ]; then + echo "Installing preview" rustup component add rustfmt-preview else + echo "Installing standard" rustup component add rustfmt fi From d2627e07f5dc19e20b8b85b8844dafc212f952fa Mon Sep 17 00:00:00 2001 From: Bradlee Speice Date: Sat, 8 Dec 2018 19:41:44 -0500 Subject: [PATCH 6/7] String issue? --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0c4ade2..455c287 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,7 +44,7 @@ install: echo "TRAVIS_RUST_VERSION=\"$TRAVIS_RUST_VERSION\"" if [ "$TRAVIS_RUST_VERSION" == "nightly" ]; then echo "Installing preview" - rustup component add rustfmt-preview + rustup component add "rustfmt-preview" else echo "Installing standard" rustup component add rustfmt From d4cbf607f25abdcc65c0c287843de4842bba0f4c Mon Sep 17 00:00:00 2001 From: Bradlee Speice Date: Sat, 8 Dec 2018 23:09:58 -0500 Subject: [PATCH 7/7] Disable rustfmt for the time being --- .travis.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 455c287..159fc2a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,18 +40,12 @@ before_install: install: - source ~/.cargo/env || true - - | - echo "TRAVIS_RUST_VERSION=\"$TRAVIS_RUST_VERSION\"" - if [ "$TRAVIS_RUST_VERSION" == "nightly" ]; then - echo "Installing preview" - rustup component add "rustfmt-preview" - else - echo "Installing standard" - rustup component add rustfmt - fi + # Disabling for the time being: rust-lang/rustup.rs#1558 + # - rustup component add rustfmt script: - - cargo fmt --all -- --check + # Disabling for the time being: rust-lang/rustup.rs#1558 + # - cargo fmt --all -- --check - | if [ -z "$TRAVIS_TAG" ]; then cargo test