Skip to content

Commit

Permalink
CI Improvements (#2928)
Browse files Browse the repository at this point in the history
* Switch to Windows 2019

* use macOS 10.14 and do not install Rust when not not necessary, fix rust_flags
  • Loading branch information
quentinlesceller authored Jun 27, 2019
1 parent 1609b04 commit 2f01274
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 10 deletions.
9 changes: 2 additions & 7 deletions .ci/install.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,16 @@
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"
git apply .ci/win.patch
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
sudo apt-get update -yqq
sudo apt-get install -yqq --no-install-recommends libncursesw5-dev
echo "##vso[task.setvariable variable=PATH;]$PATH:$HOME/.cargo/bin"
displayName: Linux Install Rust and Dependencies
displayName: Linux Install Dependencies
condition: eq( variables['Agent.OS'], 'Linux' )
6 changes: 3 additions & 3 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ pr:

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

jobs:
- job: linux
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
- template: '.ci/release.yml'
- job: macos
pool:
vmImage: macos-10.13
vmImage: macos-10.14
strategy:
matrix:
test:
Expand All @@ -69,7 +69,7 @@ jobs:
- template: '.ci/release.yml'
- job: windows
pool:
vmImage: vs2017-win2016
vmImage: windows-2019
strategy:
matrix:
test:
Expand Down

0 comments on commit 2f01274

Please sign in to comment.