Use Windows 2022 rather than deprecated Windows 2019

tpaviot · tpaviot · commit cf3c100563d7 · 2025-06-11T15:09:26.000+02:00
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -29,18 +29,11 @@ jobs:
 
 - template:  conda-build.yml
   parameters:
-    name: Windows_VS2019_python39
-    vmImage: 'windows-2019'
+    name: Windows_VS2022_python39
+    vmImage: 'windows-2022'
     py_maj: 3
     py_min: 9
 
-- template: conda-build.yml
-  parameters:
-    name: Ubuntu_22_04_python310
-    vmImage: 'ubuntu-22.04'
-    py_maj: 3
-    py_min: 10
-
 - template: conda-build.yml
   parameters:
     name: Ubuntu_24_04_python310
@@ -57,15 +50,15 @@ jobs:
 
 - template:  conda-build.yml
   parameters:
-    name: Windows_VS2019_python310
-    vmImage: 'windows-2019'
+    name: Windows_VS2022_python310
+    vmImage: 'windows-2022'
     py_maj: 3
     py_min: 10
 
 - template: conda-build.yml
   parameters:
-    name: Ubuntu_22_04_python311
-    vmImage: 'ubuntu-22.04'
+    name: Ubuntu_24_04_python311
+    vmImage: 'ubuntu-24.04'
     py_maj: 3
     py_min: 11
 
@@ -78,15 +71,15 @@ jobs:
 
 - template:  conda-build.yml
   parameters:
-    name: Windows_VS2019_python311
-    vmImage: 'windows-2019'
+    name: Windows_VS2022_python311
+    vmImage: 'windows-2022'
     py_maj: 3
     py_min: 11
 
 - template: conda-build.yml
   parameters:
-    name: Ubuntu_22_04_python312
-    vmImage: 'ubuntu-22.04'
+    name: Ubuntu_24_04_python312
+    vmImage: 'ubuntu-24.04'
     py_maj: 3
     py_min: 12
 
@@ -99,7 +92,7 @@ jobs:
 
 - template:  conda-build.yml
   parameters:
-    name: Windows_VS2019_python312
-    vmImage: 'windows-2019'
+    name: Windows_VS2022_python312
+    vmImage: 'windows-2022'
     py_maj: 3
     py_min: 12
diff --git a/conda-build.yml b/conda-build.yml
@@ -3,7 +3,6 @@ parameters:
   vmImage: 'ubuntu-22.04'
   py_maj: '3'
   py_min: '9'
-
 jobs:
 - job: ${{ parameters.name }}
   timeoutInMinutes: 360
@@ -31,7 +30,6 @@ jobs:
   - ${{ if contains(parameters.vmImage, 'win') }}:
     - powershell: Write-Host "##vso[task.prependpath]$env:CONDA\Scripts"
       displayName: 'Add conda to PATH'
-
   # Ubuntu install opengl items and remove swig packages that conflict with anaconda
   - ${{ if contains(parameters.vmImage, 'ubuntu') }}:
     - bash: |
@@ -40,38 +38,39 @@ jobs:
         sudo apt list --installed && \
         sudo apt remove swig swig4.0
       displayName: 'Install OpenGL headers'
-
   - bash: |
         conda config --set always_yes yes --set changeps1 no && \
         conda update -q conda && \
         conda info -a && \
         conda config --add channels https://conda.anaconda.org/conda-forge
     displayName: 'Conda config and info'
-
-  - ${{ if eq(parameters.vmImage, 'windows-2019') }}:
-    - script: |
-        call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\VC\\Auxiliary\\Build\\vcvars64.bat"
-      displayName: 'Set Windows environment'
-      env:
-        CXX: "cl.exe"
-
+  - bash: conda create --yes --quiet --name build_env conda-build conda-verify libarchive python=${{ parameters.py_maj }}.${{ parameters.py_min }} anaconda-client
+    displayName: 'Create Anaconda environment'
   - ${{ if eq(parameters.vmImage, 'windows-2022') }}:
     - script: |
         call "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\Build\\vcvars64.bat"
-      displayName: 'Set Windows environment'
+        echo "PATH=%PATH%"
+        where cl.exe
+        set CC=cl.exe
+        set CXX=cl.exe
+        call activate build_env
+        conda-build --no-remove-work-dir --dirty ci/conda
+      displayName: 'Set Windows environment and build'
       env:
         CXX: "cl.exe"
-
-  - bash: conda create --yes --quiet --name build_env conda-build conda-verify libarchive python=${{ parameters.py_maj }}.${{ parameters.py_min }} anaconda-client
-    displayName: 'Create Anaconda environment'
-    
-  - bash: |
-      source activate build_env && \
-      conda-build --no-remove-work-dir --dirty ci/conda
-    displayName: 'Run conda build'
-    failOnStderr: false
-    env:
-      PYTHONBUFFERED: 1
-      PYTHON_VERSION: ${{ parameters.py_maj }}.${{ parameters.py_min }}
-      PACKAGE_VERSION: $(Build.SourceBranchName)
-      TOKEN: $(anaconda.TOKEN)
+        CC: "cl.exe"
+        PYTHONBUFFERED: 1
+        PYTHON_VERSION: ${{ parameters.py_maj }}.${{ parameters.py_min }}
+        PACKAGE_VERSION: $(Build.SourceBranchName)
+        TOKEN: $(anaconda.TOKEN)
+  - ${{ if not(contains(parameters.vmImage, 'win')) }}:
+    - bash: |
+        source activate build_env && \
+        conda-build --no-remove-work-dir --dirty ci/conda
+      displayName: 'Run conda build'
+      failOnStderr: false
+      env:
+        PYTHONBUFFERED: 1
+        PYTHON_VERSION: ${{ parameters.py_maj }}.${{ parameters.py_min }}
+        PACKAGE_VERSION: $(Build.SourceBranchName)
+        TOKEN: $(anaconda.TOKEN)
