From 5467515d36d6be6dcf6bc4733dae8e2b704f9381 Mon Sep 17 00:00:00 2001
From: Quentin Le Sceller <q.lesceller@gmail.com>
Date: Fri, 28 Jun 2019 11:15:08 +0200
Subject: [PATCH] CI Improvements (#166)

* Switch to Windows2019

* Delete Rust install step for Windows and Linux

* Add missing indent

* Missing indents

* Add forgotten LLVM

* Fix indents

* Fix rust flags
---
 .ci/install.yml     | 10 +---------
 azure-pipelines.yml |  7 +++----
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/.ci/install.yml b/.ci/install.yml
index 4208cd0a7..b3607ea5f 100644
--- a/.ci/install.yml
+++ b/.ci/install.yml
@@ -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' )
\ No newline at end of file
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 27bb60a2b..b23106125 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -25,7 +25,7 @@ pr:
 
 variables:
   RUST_BACKTRACE: '1'
-  RUST_FLAGS: '-C debug-assertions'
+  RUSTFLAGS: '-C debug-assertions'
 
 jobs:
 - job: linux
@@ -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:
@@ -65,7 +64,7 @@ jobs:
     - template: '.ci/release.yml'
 - job: windows
   pool:
-    vmImage: vs2017-win2016
+    vmImage: windows-2019
   strategy:
     matrix:
       test: