Auto merge of #7139 - rust-lang:azure-pipelines, r=alexcrichton

Set up CI with Azure Pipelines

README.md

@@ -6,8 +6,7 @@ Learn more at https://doc.rust-lang.org/cargo/
 
 ## Code Status
 
-[![Build Status](https://travis-ci.com/rust-lang/cargo.svg?branch=master)](https://travis-ci.com/rust-lang/cargo)
-[![Build Status](https://ci.appveyor.com/api/projects/status/github/rust-lang/cargo?branch=master&svg=true)](https://ci.appveyor.com/project/rust-lang-libs/cargo)
+[![Build Status](https://dev.azure.com/rust-lang/cargo/_apis/build/status/rust-lang.cargo?branchName=master)](https://dev.azure.com/rust-lang/cargo/_build/latest?definitionId=18&branchName=master)
 
 Code documentation: https://docs.rs/cargo/
 

azure-pipelines.yml

@@ -0,0 +1,91 @@
+trigger:
+  branches:
+    include:
+    - '*'
+    exclude:
+    - master
+pr:
+- master
+
+jobs:
+- job: Linux
+  pool:
+    vmImage: ubuntu-16.04
+  steps:
+    - template: ci/azure-test-all.yml
+  strategy:
+    matrix:
+      stable:
+        TOOLCHAIN: stable
+      beta:
+        TOOLCHAIN: beta
+      nightly:
+        TOOLCHAIN: nightly
+  variables:
+    OTHER_TARGET: i686-unknown-linux-gnu
+
+- job: macOS
+  pool:
+    vmImage: macos-10.13
+  steps:
+    - template: ci/azure-test-all.yml
+  variables:
+    TOOLCHAIN: stable
+    OTHER_TARGET: i686-apple-darwin
+
+- job: Windows
+  pool:
+    vmImage: windows-2019
+  steps:
+    - template: ci/azure-test-all.yml
+  strategy:
+    matrix:
+      x86_64-msvc:
+        TOOLCHAIN: stable-x86_64-pc-windows-msvc
+        OTHER_TARGET: i686-pc-windows-msvc
+- job: rustfmt
+  pool:
+    vmImage: ubuntu-16.04
+  steps:
+    - template: ci/azure-install-rust.yml
+    - bash: rustup component add rustfmt
+      displayName: "Install rustfmt"
+    - bash: cargo fmt --all -- --check
+      displayName: "Check rustfmt (cargo)"
+    - bash: cd crates/cargo-test-macro && cargo fmt --all -- --check
+      displayName: "Check rustfmt (cargo-test-macro)"
+    - bash: cd crates/crates-io && cargo fmt --all -- --check
+      displayName: "Check rustfmt (crates-io)"
+    - bash: cd crates/resolver-tests && cargo fmt --all -- --check
+      displayName: "Check rustfmt (resolver-tests)"
+  variables:
+    TOOLCHAIN: stable
+
+- job: resolver
+  pool:
+    vmImage: ubuntu-16.04
+  steps:
+    - template: ci/azure-install-rust.yml
+    - bash: cargo test --manifest-path crates/resolver-tests/Cargo.toml
+      displayName: "Resolver tests"
+  variables:
+    TOOLCHAIN: stable
+
+- job: docs
+  pool:
+    vmImage: ubuntu-16.04
+  steps:
+    - template: ci/azure-install-rust.yml
+    - bash: |
+        set -e
+        mkdir mdbook
+        curl -Lf https://github.com/rust-lang-nursery/mdBook/releases/download/v0.3.1/mdbook-v0.3.1-x86_64-unknown-linux-gnu.tar.gz | tar -xz --directory=./mdbook
+        echo "##vso[task.prependpath]`pwd`/mdbook"
+      displayName: "Install mdbook"
+    - bash: cargo doc --no-deps
+      displayName: "Build documentation"
+    - bash: cd src/doc && mdbook build --dest-dir ../../target/doc
+      displayName: "Build mdbook documentation"
+  variables:
+    TOOLCHAIN: stable
+

ci/azure-install-rust.yml

@@ -0,0 +1,28 @@
+steps:
+  - bash: |
+      set -e
+      if command -v rustup; then
+        echo `command -v rustup` `rustup -V` already installed
+        rustup self update
+      elif [ "$AGENT_OS" = "Windows_NT" ]; then
+        curl -sSf -o rustup-init.exe https://win.rustup.rs
+        rustup-init.exe -y --default-toolchain $TOOLCHAIN
+        echo "##vso[task.prependpath]$USERPROFILE/.cargo/bin"
+      else
+        curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $TOOLCHAIN
+        echo "##vso[task.prependpath]$HOME/.cargo/bin"
+      fi
+    displayName: Install rustup
+
+  - bash: |
+      set -e
+      rustup update $TOOLCHAIN
+      rustup default $TOOLCHAIN
+    displayName: Install rust
+
+  - bash: |
+      set -ex
+      rustup -V
+      rustc -Vv
+      cargo -V
+    displayName: Query rust and cargo versions

ci/azure-test-all.yml

@@ -0,0 +1,28 @@
+steps:
+- checkout: self
+  fetchDepth: 1
+
+- template: azure-install-rust.yml
+
+- bash: rustup target add $OTHER_TARGET
+  displayName: "Install cross-compile target"
+
+- bash: sudo apt install gcc-multilib
+  displayName: "Install gcc-multilib (linux)"
+  condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))
+
+# Some tests rely on a clippy command to run, so let's try to install clippy to
+# we can be sure to run those tests.
+- bash: rustup component add clippy || echo "clippy not available"
+  displayName: "Install clippy (maybe)"
+
+# Deny warnings on CI to avoid warnings getting into the codebase, and note the
+# `force-system-lib-on-osx` which is intended to fix compile issues on OSX where
+# compiling curl from source on OSX yields linker errors on Azure.
+#
+# Note that the curl issue is traced back to alexcrichton/curl-rust#279 where it
+# looks like the OSX version we're actually running on is such that a symbol is
+# emitted that's never worked. For now force the system library to be used to
+# fix the link errors.
+- bash: cargo test --features 'deny-warnings curl/force-system-lib-on-osx'
+  displayName: "cargo test"

tests/testsuite/config.rs

@@ -2,12 +2,18 @@ use std::borrow::Borrow;
 use std::collections;
 use std::fs;
 
-use crate::support::{lines_match, paths, project};
+use crate::support::{paths, project};
 use cargo::core::{enable_nightly_features, Shell};
 use cargo::util::config::{self, Config};
 use cargo::util::toml::{self, VecStringOrBool as VSOB};
 use serde::Deserialize;
 
+fn lines_match(a: &str, b: &str) -> bool {
+    // Perform a small amount of normalization for filesystem paths before we
+    // send this to the `lines_match` function.
+    crate::support::lines_match(&a.replace("\\", "/"), &b.replace("\\", "/"))
+}
+
 #[cargo_test]
 fn read_env_vars_for_config() {
     let p = project()