From 3582022313c696b520bbf022e49a767d4dd6abb5 Mon Sep 17 00:00:00 2001 From: Johan Mabille Date: Wed, 9 Mar 2022 09:22:08 +0100 Subject: [PATCH 1/3] Removed old OSX image, added new one --- .azure-pipelines/azure-pipelines-osx.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 282a8acfd..beeafce57 100644 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -2,10 +2,10 @@ jobs: - job: 'OSX' strategy: matrix: - macOS_10_14: - image_name: 'macOS-10.14' macOS_10_15: image_name: 'macOS-10.15' + macOS_11: + image_name: 'macOS-11' pool: vmImage: $(image_name) variables: From 164d9d594801dfa42b4ef0093a4faf20c8ac9d7f Mon Sep 17 00:00:00 2001 From: Johan Mabille Date: Wed, 9 Mar 2022 10:04:27 +0100 Subject: [PATCH 2/3] Pinning doctest 2.4.7 --- .azure-pipelines/azure-pipelines-win.yml | 2 +- environment-dev.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 9c0ff6f56..2abde0e9c 100644 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -36,7 +36,7 @@ jobs: - script: | conda install cmake==3.14.0 ^ ninja ^ - doctest ^ + doctest==2.4.7 ^ nlohmann_json ^ xtl==0.7.0 ^ xsimd==8.0.3 ^ diff --git a/environment-dev.yml b/environment-dev.yml index f4ea820a2..b12fe94ce 100644 --- a/environment-dev.yml +++ b/environment-dev.yml @@ -6,4 +6,4 @@ dependencies: - xtl=0.7.0 - xsimd=8.0.3 - nlohmann_json - - doctest + - doctest=2.4.7 From 699a5f25302a155db031900794398b83ff24a49c Mon Sep 17 00:00:00 2001 From: Johan Mabille Date: Wed, 9 Mar 2022 11:10:39 +0100 Subject: [PATCH 3/3] debugging wincl install --- .azure-pipelines/azure-pipelines-win.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 2abde0e9c..86d76bbad 100644 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -31,16 +31,18 @@ jobs: conda info displayName: "Configure Miniconda" + - script: + conda install mamba # Create conda enviroment # Note: conda activate doesn't work here, because it creates a new shell! - script: | - conda install cmake==3.14.0 ^ + mamba install cmake==3.14.0 ^ ninja ^ doctest==2.4.7 ^ nlohmann_json ^ xtl==0.7.0 ^ xsimd==8.0.3 ^ - python=3.6 + python=3.9 conda list displayName: "Install conda packages"