From 92fc002e1f1c8d6b066b678558d217118bd11c46 Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Thu, 7 Oct 2021 20:09:14 +0200
Subject: [PATCH] Update azure-pipelines.yml

---
 azure-pipelines.yml | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index bd2e6ff17..d88cfa444 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -65,8 +65,7 @@ jobs:
   - task: CMake@1
     inputs:
       workingDirectory: 'build' # Optional
-      cmakeArgs: '-G "Ninja" -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DMSVC_STATIC_CRT=ON ..'
-#      cmakeArgs: '-G "Visual Studio 16 2019" ..'
+      cmakeArgs: '-G "Visual Studio 16 2019" ..'
   - task: CMake@1
     inputs:
       cmakeArgs: '--build . --config Release'
@@ -90,15 +89,14 @@ jobs:
   steps:
   - powershell: Write-Host "##vso[task.prependpath]$env:CONDA\Scripts"
     displayName: Add conda to PATH
- 
-  - script: |
+    
+  - powershell: Write-Host "##vso[task.prependpath]$env:CONDA\Library\bin"
+    displayName: Add ninja to PATH
+
+- script: |
       conda config --add channels conda-forge --force
       conda config --set auto_update_conda false
       conda install --yes ninja
-      conda info
-      dir C:\Miniconda\Scripts
-      dir C:\Miniconda\condabin
-      dir C:\Miniconda\envs\base
       mkdir build & cd build
       cmake -G Ninja -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DMSVC_STATIC_CRT=ON ..
       cmake --build .
@@ -110,13 +108,13 @@ jobs:
   - powershell: Write-Host "##vso[task.prependpath]$env:CONDA\Scripts"
     displayName: Add conda to PATH
 
-  - powershell: Write-Host "##vso[task.prependpath]$env:CONDA\bin"
+  - powershell: Write-Host "##vso[task.prependpath]$env:CONDA\Library\bin"
+    displayName: Add ninja and flang to PATH
 
   - script: |
       conda config --add channels conda-forge --force
       conda config --set auto_update_conda false
       conda install --yes --quiet ninja flang
-      dir C:\Miniconda\Tools
       mkdir build & cd build
       cmake -G Ninja -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_Fortran_COMPILER=flang -DMSVC_STATIC_CRT=ON ..
       cmake --build .