Merge pull request #2031 from swt2c/ci_updates

Ci updates
wxWidgets · Nov 18, 2021 · c1ac915 · c1ac915
2 parents 95578b4 + 753c6bf
commit c1ac915
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 17 deletions.
diff --git a/.azure/ci-linux-job.yml b/.azure/ci-linux-job.yml
@@ -22,6 +22,10 @@ jobs:
         python: 'python3.9'
         make_venv: 'python3.9 -m venv venv'
         venv_pkg: 'python3.9-venv'
+      Py310:
+        python: 'python3.10'
+        make_venv: 'python3.10 -m venv venv'
+        venv_pkg: 'python3.10-venv'
 
   variables: {'PYTHONUNBUFFERED': '1'}
 

diff --git a/.azure/ci-macos-job.yml b/.azure/ci-macos-job.yml
@@ -3,25 +3,29 @@ jobs:
   timeoutInMinutes: 90
   displayName: 'MacOS CI'
   pool:
-    vmImage: 'macOS-10.14'
+    vmImage: 'macOS-1015'
   strategy:
     matrix:
       Py36:
         python_version: '3.6.8'
         python_pkg: 'python-3.6.8-macosx10.9.pkg'
         python: 'python3.6'
       Py37:
-        python_version: '3.7.3'
-        python_pkg: 'python-3.7.3-macosx10.9.pkg'
+        python_version: '3.7.9'
+        python_pkg: 'python-3.7.9-macosx10.9.pkg'
         python: 'python3.7'
       Py38:
-        python_version: '3.8.0'
-        python_pkg: 'python-3.8.0-macosx10.9.pkg'
+        python_version: '3.8.10'
+        python_pkg: 'python-3.8.10-macosx10.9.pkg'
         python: 'python3.8'
       Py39:
-        python_version: '3.9.0'
-        python_pkg: 'python-3.9.0-macosx10.9.pkg'
+        python_version: '3.9.9'
+        python_pkg: 'python-3.9.9-macosx10.9.pkg'
         python: 'python3.9'
+      Py310:
+        python_version: '3.10.0'
+        python_pkg: 'python-3.10.0post2-macos11.pkg'
+        python: 'python3.10'
 
 
   variables: {'PYTHONUNBUFFERED': '1'}

diff --git a/.azure/ci-windows-job.yml b/.azure/ci-windows-job.yml
@@ -3,8 +3,7 @@ jobs:
   timeoutInMinutes: 90
   displayName: 'Windows CI'
   pool:
-    #vmImage: 'vs2015-win2012r2'
-    vmImage: 'vs2017-win2016'
+    vmImage: 'windows-2019'
   strategy:
     matrix:
       Py36_x86:
@@ -19,10 +18,14 @@ jobs:
         python.version: '3.8'
         python.arch: x86
         addToPath: true
-      # Py39_x86:
-      #   python.version: '3.9'
-      #   python.arch: x86
-      #   addToPath: true
+      Py39_x86:
+        python.version: '3.9'
+        python.arch: x86
+        addToPath: true
+      Py310_x86:
+        python.version: '3.10'
+        python.arch: x86
+        addToPath: true
 
       Py36_x64:
         python.version: '3.6'
@@ -36,10 +39,14 @@ jobs:
         python.version: '3.8'
         python.arch: x64
         addToPath: true
-      # Py39_x64:
-      #   python.version: '3.9'
-      #   python.arch: x64
-      #   addToPath: true
+      Py39_x64:
+        python.version: '3.9'
+        python.arch: x64
+        addToPath: true
+      Py310_x64:
+        python.version: '3.10'
+        python.arch: x64
+        addToPath: true
 
 
   variables: {'PYTHONUNBUFFERED': '1'}