Skip to content

Commit

Permalink
Make Clippy Lint a separate step; upgrade all Ubuntu to 18.04
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark McCaskey committed Jan 17, 2020
1 parent 5931944 commit 172c9e9
Showing 1 changed file with 23 additions and 8 deletions.
31 changes: 23 additions & 8 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,33 @@ jobs:
- template: .azure/install-rust.yml
- script: |
rustup component add rustfmt
rustup component add clippy || cargo install --git https://github.com/rust-lang/rust-clippy/ --force clippy
displayName: Lint dependencies
- script: cargo fmt --all -- --check && cargo clippy --workspace
- script: cargo fmt --all -- --check
displayName: Lint
variables:
rust_toolchain: '1.39.0'

- job: clippy-lint
pool:
vmImage: "ubuntu-18.04"
steps:
- checkout: self
submodules: true
- template: .azure/install-rust.yml
- script: |
rustup component add rustfmt
rustup component add clippy || cargo install --git https://github.com/rust-lang/rust-clippy/ --force clippy
displayName: Lint dependencies with clippy
- script: cargo clippy --workspace
displayName: Clippy Lint
variables:
rust_toolchain: nightly-2019-12-19

- job: Test
strategy:
matrix:
linux:
imageName: "ubuntu-16.04"
imageName: "ubuntu-18.04"
rust_toolchain: nightly-2019-12-19
mac:
imageName: "macos-10.14"
Expand Down Expand Up @@ -73,7 +88,7 @@ jobs:

- job: Check
pool:
vmImage: "ubuntu-16.04"
vmImage: "ubuntu-18.04"
variables:
rust_toolchain: nightly-2019-12-19
condition: in(variables['Build.SourceBranch'], 'refs/heads/master', 'refs/heads/staging', 'refs/heads/trying')
Expand All @@ -92,7 +107,7 @@ jobs:
strategy:
matrix:
linux:
imageName: "ubuntu-16.04"
imageName: "ubuntu-18.04"
rust_toolchain: nightly-2019-12-19
mac:
imageName: "macos-10.14"
Expand Down Expand Up @@ -159,7 +174,7 @@ jobs:
strategy:
matrix:
linux:
imageName: "ubuntu-16.04"
imageName: "ubuntu-18.04"
rust_toolchain: nightly-2019-12-19
mac:
imageName: "macos-10.14"
Expand Down Expand Up @@ -212,7 +227,7 @@ jobs:

- job: Build_Docs
pool:
vmImage: "ubuntu-16.04"
vmImage: "ubuntu-18.04"
variables:
rust_toolchain: nightly-2019-08-15
condition: in(variables['Build.SourceBranch'], 'refs/heads/master', 'refs/heads/staging', 'refs/heads/trying')
Expand Down Expand Up @@ -287,7 +302,7 @@ jobs:
- Build_Docs
displayName: Deploy API Documentation to GitHub
pool:
vmImage: "ubuntu-16.04"
vmImage: "ubuntu-18.04"
condition: in(variables['Build.SourceBranch'], 'refs/heads/master')
steps:
- checkout: self
Expand Down

0 comments on commit 172c9e9

Please sign in to comment.