Merge commit '4236289b75ee55c78538c749512cdbeea5e1c332' into update-rustfmt

[rust.git] / src / tools / rustfmt / appveyor.yml

diff --git a/src/tools/rustfmt/appveyor.yml b/src/tools/rustfmt/appveyor.yml
index 7bfe696009face52be24d9f41c8942f27392bf3a..5ac99fd71f8f87efcf51346e7f8f3fda43dc9d76 100644 (file)
--- a/src/tools/rustfmt/appveyor.yml
+++ b/src/tools/rustfmt/appveyor.yml
@@ -1,55 +1,55 @@
-# This is based on https://github.com/japaric/rust-everywhere/blob/master/appveyor.yml\r
-# and modified (mainly removal of deployment) to suit rustfmt.\r
-\r
-environment:\r
-  global:\r
-    PROJECT_NAME: rustfmt\r
-  matrix:\r
-    # Stable channel\r
-    # - TARGET: i686-pc-windows-gnu\r
-    #   CHANNEL: stable\r
-    # - TARGET: i686-pc-windows-msvc\r
-    #   CHANNEL: stable\r
-    # - TARGET: x86_64-pc-windows-gnu\r
-    #   CHANNEL: stable\r
-    # - TARGET: x86_64-pc-windows-msvc\r
-    #   CHANNEL: stable\r
-    # Beta channel\r
-    # - TARGET: i686-pc-windows-gnu\r
-    #   CHANNEL: beta\r
-    # - TARGET: i686-pc-windows-msvc\r
-    #   CHANNEL: beta\r
-    # - TARGET: x86_64-pc-windows-gnu\r
-    #   CHANNEL: beta\r
-    # - TARGET: x86_64-pc-windows-msvc\r
-    #   CHANNEL: beta\r
-    # Nightly channel\r
-    - TARGET: i686-pc-windows-gnu\r
-      CHANNEL: nightly\r
-    - TARGET: i686-pc-windows-msvc\r
-      CHANNEL: nightly\r
-    - TARGET: x86_64-pc-windows-gnu\r
-      CHANNEL: nightly\r
-    - TARGET: x86_64-pc-windows-msvc\r
-      CHANNEL: nightly\r
-\r
-# Install Rust and Cargo\r
-# (Based on from https://github.com/rust-lang/libc/blob/master/appveyor.yml)\r
-install:\r
-  - appveyor-retry appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe\r
-  - if "%TARGET%" == "i686-pc-windows-gnu" set PATH=%PATH%;C:\msys64\mingw32\bin\r
-  - if "%TARGET%" == "x86_64-pc-windows-gnu" set PATH=%PATH%;C:\msys64\mingw64\bin\r
-  - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin\r
-  - rustup-init.exe --default-host %TARGET% --default-toolchain %CHANNEL% -y\r
-  - rustc -Vv\r
-  - cargo -V\r
-\r
-# ???\r
-build: false\r
-\r
-test_script:\r
-  - set CFG_RELEASE_CHANNEL=nightly\r
-  - set CFG_RELEASE=nightly\r
-  - cargo build --verbose\r
-  - cargo test\r
-  - cargo test -- --ignored\r
+# This is based on https://github.com/japaric/rust-everywhere/blob/master/appveyor.yml
+# and modified (mainly removal of deployment) to suit rustfmt.
+
+environment:
+  global:
+    PROJECT_NAME: rustfmt
+  matrix:
+    # Stable channel
+    # - TARGET: i686-pc-windows-gnu
+    #   CHANNEL: stable
+    # - TARGET: i686-pc-windows-msvc
+    #   CHANNEL: stable
+    # - TARGET: x86_64-pc-windows-gnu
+    #   CHANNEL: stable
+    # - TARGET: x86_64-pc-windows-msvc
+    #   CHANNEL: stable
+    # Beta channel
+    # - TARGET: i686-pc-windows-gnu
+    #   CHANNEL: beta
+    # - TARGET: i686-pc-windows-msvc
+    #   CHANNEL: beta
+    # - TARGET: x86_64-pc-windows-gnu
+    #   CHANNEL: beta
+    # - TARGET: x86_64-pc-windows-msvc
+    #   CHANNEL: beta
+    # Nightly channel
+    - TARGET: i686-pc-windows-gnu
+      CHANNEL: nightly
+    - TARGET: i686-pc-windows-msvc
+      CHANNEL: nightly
+    - TARGET: x86_64-pc-windows-gnu
+      CHANNEL: nightly
+    - TARGET: x86_64-pc-windows-msvc
+      CHANNEL: nightly
+
+# Install Rust and Cargo
+# (Based on from https://github.com/rust-lang/libc/blob/master/appveyor.yml)
+install:
+  - appveyor-retry appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
+  - if "%TARGET%" == "i686-pc-windows-gnu" set PATH=%PATH%;C:\msys64\mingw32\bin
+  - if "%TARGET%" == "x86_64-pc-windows-gnu" set PATH=%PATH%;C:\msys64\mingw64\bin
+  - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
+  - rustup-init.exe --default-host %TARGET% --default-toolchain %CHANNEL% -y
+  - rustc -Vv
+  - cargo -V
+
+# ???
+build: false
+
+test_script:
+  - set CFG_RELEASE_CHANNEL=nightly
+  - set CFG_RELEASE=nightly
+  - cargo build --verbose
+  - cargo test
+  - cargo test -- --ignored