Skip to content

Commit 5dbe1fc

Browse files
authored
Merge pull request #2482 from JohanMabille/ci
Removed old OSX image, added new one
2 parents 01ccbc0 + 699a5f2 commit 5dbe1fc

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

.azure-pipelines/azure-pipelines-osx.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ jobs:
22
- job: 'OSX'
33
strategy:
44
matrix:
5-
macOS_10_14:
6-
image_name: 'macOS-10.14'
75
macOS_10_15:
86
image_name: 'macOS-10.15'
7+
macOS_11:
8+
image_name: 'macOS-11'
99
pool:
1010
vmImage: $(image_name)
1111
variables:

.azure-pipelines/azure-pipelines-win.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,18 @@ jobs:
3131
conda info
3232
displayName: "Configure Miniconda"
3333
34+
- script:
35+
conda install mamba
3436
# Create conda enviroment
3537
# Note: conda activate doesn't work here, because it creates a new shell!
3638
- script: |
37-
conda install cmake==3.14.0 ^
39+
mamba install cmake==3.14.0 ^
3840
ninja ^
39-
doctest ^
41+
doctest==2.4.7 ^
4042
nlohmann_json ^
4143
xtl==0.7.0 ^
4244
xsimd==8.0.3 ^
43-
python=3.6
45+
python=3.9
4446
conda list
4547
displayName: "Install conda packages"
4648

environment-dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ dependencies:
66
- xtl=0.7.0
77
- xsimd=8.0.3
88
- nlohmann_json
9-
- doctest
9+
- doctest=2.4.7

0 commit comments

Comments
 (0)