From 4726668688a6c21fba434c4afe238f807e84131c Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Sat, 9 Oct 2021 16:31:19 +0200 Subject: [PATCH] Update azure-pipelines.yml --- azure-pipelines.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0015aae4a..ddb537d09 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -91,12 +91,12 @@ jobs: Write-Host "##vso[task.prependpath]$env:CONDA\Scripts" Write-Host "##vso[task.prependpath]$env:CONDA\Library\bin" - script: | - call C:\Miniconda\Scripts\activate.bat + #call C:\Miniconda\Scripts\activate.bat conda config --add channels conda-forge --force conda config --set auto_update_conda false conda install --yes ninja call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" - set "PATH=C:\Miniconda\Scripts;C:\Miniconda\Library\bin;%PATH%" + set "PATH=C:\Miniconda\Scripts;C:\Miniconda\Library\bin;C:\Miniconda\Library\usr\bin;C:\Miniconda\condabin;%PATH%" set "LIB=C:\Miniconda\Library\lib;%LIB%" set "CPATH=C:\Miniconda\Library\include;%CPATH%" mkdir build @@ -113,13 +113,13 @@ jobs: Write-Host "##vso[task.prependpath]$env:CONDA\Scripts" Write-Host "##vso[task.prependpath]$env:CONDA\Library\bin" - script: | - set "PATH=C:\Miniconda\Scripts;C:\Miniconda\Library\bin;%PATH%" + set "PATH=C:\Miniconda\Scripts;C:\Miniconda\Library\bin;C:\Miniconda\Library\usr\bin;C:\Miniconda\condabin;%PATH%" set "LIB=C:\Miniconda\Library\lib;%LIB%" set "CPATH=C:\Miniconda\Library\include;%CPATH%" - call C:\Miniconda\Scripts\activate.bat conda config --add channels conda-forge --force conda config --set auto_update_conda false conda install --yes ninja flang + #call C:\Miniconda\Scripts\activate.bat mkdir build cd build call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"