Merge pull request #222 from JohanMabille/ci

CI fixes
xtensor-stack · Jan 16, 2023 · 7b96edd · 7b96edd
2 parents f3d5463 + 10fa318
commit 7b96edd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
@@ -3,10 +3,10 @@ jobs:
     strategy:
       matrix:
         macOS_10_14:
-          image_name: 'macOS-10.14'
+          image_name: macOS-11
           blas: 'mkl'
         macOS_10_15:
-          image_name: 'macOS-10.15'
+          image_name: macOS-12
           blas: 'mkl'
     pool:
       vmImage: $(image_name)
@@ -17,9 +17,7 @@ jobs:
     steps:
       - script: |
           echo "Removing homebrew for Azure to avoid conflicts with conda"
-          curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/uninstall > ~/uninstall_homebrew
-          chmod +x ~/uninstall_homebrew
-          ~/uninstall_homebrew -f -q
+          /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/uninstall.sh)"
         displayName: Remove homebrew
 
       - bash: |

diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
@@ -1,7 +1,7 @@
 jobs:
-  - job: 'Windows clang'
+  - job: Windows_clang
     pool:
-      vmImage: 'vs2017-win2016'
+      vmImage: windows-2019
     timeoutInMinutes: 360
     steps:
 
@@ -36,8 +36,8 @@ jobs:
           conda install cmake==3.14.0 ^
                         mkl-devel ^
                         ninja ^
-                        xtensor=0.24.0 ^
-                        python=3.6
+                        xtensor=0.24.3 ^
+                        python=3.9
           conda list
         displayName: "Install conda packages"