From 4aa94dc732c67272b36a202245a8b76f17494256 Mon Sep 17 00:00:00 2001
From: Mats Wichmann <mats@linux.com>
Date: Thu, 17 Nov 2022 08:36:56 -0700
Subject: Bump versions on CI runners

Chages appveyor test matrix: 3.6, 3.8, 3.10+cov, 3.11

Linux build now uses ubuntu-22.04 (although ubuntu-latest is about
to become 22.04 anyway, be explicit for now); use 3.10.

Signed-off-by: Mats Wichmann <mats@linux.com>
---
 .appveyor.yml                 | 26 ++++++++++++--------------
 .github/workflows/runtest.yml | 12 ++++++------
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index ef33953..d6a427a 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -26,46 +26,44 @@ install:
 environment:
   matrix:
 
-    - WINPYTHON: "Python310"
+    - WINPYTHON: "Python311"
       COVERAGE: 0
 
-    - WINPYTHON: "Python37"
-      COVERAGE: 0
+    - WINPYTHON: "Python310"
+      COVERAGE: 1
 
     - WINPYTHON: "Python38"
       COVERAGE: 0
           
     - WINPYTHON: "Python36"
-      COVERAGE: 1
-
-
-
+      COVERAGE: 0
 
+    # skipping 3.7 and 3.9 at this time
 
 # remove sets of build jobs based on criteria below
 # to fine tune the number and platforms tested
 matrix:
   exclude:
-    # test python 3.8 on Visual Studio 2017 image
+    # test python 3.6 on Visual Studio 2017 image
     - image: Visual Studio 2017
-      WINPYTHON: "Python310"
+      WINPYTHON: "Python311"
     - image: Visual Studio 2017
-      WINPYTHON: "Python37"
+      WINPYTHON: "Python310"
     - image: Visual Studio 2017
       WINPYTHON: "Python38"
 
-    # test python 3.7 on Visual Studio 2019 image
+    # test python 3.8 on Visual Studio 2019 image
+    - image: Visual Studio 2019
+      WINPYTHON: "Python311"
     - image: Visual Studio 2019
       WINPYTHON: "Python310"
     - image: Visual Studio 2019
       WINPYTHON: "Python36"
 
-    # test python 3.10 on Visual Studio 2022 image
+    # test python 3.10 and 3.11 on Visual Studio 2022 image
     - image: Visual Studio 2022
       WINPYTHON: "Python36"
     - image: Visual Studio 2022
-      WINPYTHON: "Python37"
-    - image: Visual Studio 2022
       WINPYTHON: "Python38"
 
 # remove some binaries we don't want to be found
diff --git a/.github/workflows/runtest.yml b/.github/workflows/runtest.yml
index dd18013..7007a9b 100644
--- a/.github/workflows/runtest.yml
+++ b/.github/workflows/runtest.yml
@@ -20,7 +20,7 @@ jobs:
 
     strategy:
       matrix:
-        os: ['ubuntu-latest']
+        os: ['ubuntu-22.04']
 
     # The type of runner that the job will run on
     runs-on: ${{ matrix.os }}
@@ -30,10 +30,10 @@ jobs:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
 
-      - name: Set up Python 3.8 ${{ matrix.os }}
+      - name: Set up Python 3.10 ${{ matrix.os }}
         uses: actions/setup-python@v2
         with:
-          python-version: 3.8
+          python-version: 3.10
       - name: Install dependencies including ninja ${{ matrix.os }}
         run: |
           python -m pip install --upgrade pip setuptools wheel
@@ -41,10 +41,10 @@ jobs:
           # sudo apt-get update
       - name: runtest ${{ matrix.os }}
         run: |
-          python runtest.py -a -j 2
-      - name: Archive Failed tests
+          python runtest.py --all --time --jobs=2
+      - name: Archive Failed tests ${{ matrix.os }}
         uses: actions/upload-artifact@v2
         with:
-          name: linux-failed-tests
+          name: ${{ matrix.os }}-failed-tests
           path: |
             failed_tests.log
-- 
cgit v0.12