Skip to content

Commit

Permalink
CI Improvements (#166)
Browse files Browse the repository at this point in the history
* Switch to Windows2019

* Delete Rust install step for Windows and Linux

* Add missing indent

* Missing indents

* Add forgotten LLVM

* Fix indents

* Fix rust flags
  • Loading branch information
quentinlesceller authored Jun 28, 2019
1 parent 64e8c48 commit 5467515
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 13 deletions.
10 changes: 1 addition & 9 deletions .ci/install.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,10 @@
steps:
- script: |
curl -sSf -o rustup-init.exe https://win.rustup.rs
rustup-init.exe -y
echo "##vso[task.setvariable variable=PATH;]%PATH%;%USERPROFILE%\.cargo\bin"
choco install -y llvm
displayName: Windows Install Rust
displayName: Windows Install LLVM
condition: eq( variables['Agent.OS'], 'Windows_NT' )
- script: |
curl https://sh.rustup.rs -sSf | sh -s -- -y
echo "##vso[task.setvariable variable=PATH;]$PATH:$HOME/.cargo/bin"
displayName: macOS Install Rust
condition: eq( variables['Agent.OS'], 'Darwin' )
- script: |
curl https://sh.rustup.rs -sSf | sh -s -- -y
echo "##vso[task.setvariable variable=PATH;]$PATH:$HOME/.cargo/bin"
displayName: Linux Install Rust and Dependencies
condition: eq( variables['Agent.OS'], 'Linux' )
7 changes: 3 additions & 4 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ pr:

variables:
RUST_BACKTRACE: '1'
RUST_FLAGS: '-C debug-assertions'
RUSTFLAGS: '-C debug-assertions'

jobs:
- job: linux
Expand All @@ -46,12 +46,11 @@ jobs:
CI_JOB: release
PLATFORM: linux-amd64
steps:
- template: '.ci/install.yml'
- template: '.ci/test.yml'
- template: '.ci/release.yml'
- job: macos
pool:
vmImage: macos-10.13
vmImage: macos-10.14
strategy:
matrix:
test:
Expand All @@ -65,7 +64,7 @@ jobs:
- template: '.ci/release.yml'
- job: windows
pool:
vmImage: vs2017-win2016
vmImage: windows-2019
strategy:
matrix:
test:
Expand Down

0 comments on commit 5467515

Please sign in to comment.