pin ubuntu 22 since 24 seems broken. Runners have 4 cores now

Change-Id: Ie62b072446e8052d5465cfe2c01b2ccb05482aba
(cherry picked from commit 8d73205f352e68c6603e90494494ef21027ec68f)

diff --git a/.github/workflows/run-on-pr.yaml b/.github/workflows/run-on-pr.yaml
index aa67872e3258c27b6f329b9fa6a04a8311701ad3..0d1313bf39c9f5d9db625d8b8b4a392c7d5e6363 100644 (file)
--- a/.github/workflows/run-on-pr.yaml
+++ b/.github/workflows/run-on-pr.yaml
@@ -10,7 +10,7 @@ on:
 
 env:
   # global env to all steps
-  TOX_WORKERS: -n2
+  TOX_WORKERS: -n4
 
 permissions:
   contents: read
@@ -23,7 +23,7 @@ jobs:
       # run this job using this matrix, excluding some combinations below.
       matrix:
         os:
-          - "ubuntu-latest"
+          - "ubuntu-22.04"
         python-version:
           - "3.12"
         build-type:
@@ -60,7 +60,7 @@ jobs:
     strategy:
       matrix:
         os:
-          - "ubuntu-latest"
+          - "ubuntu-22.04"
         python-version:
           - "3.12"
         tox-env:

diff --git a/.github/workflows/run-test.yaml b/.github/workflows/run-test.yaml
index 85272a21a6ffa24684f6ae462d66bf3df20272b1..c037b91237f5d061bf7f17d60ed72124ebc4b30c 100644 (file)
--- a/.github/workflows/run-test.yaml
+++ b/.github/workflows/run-test.yaml
@@ -13,7 +13,7 @@ on:
 
 env:
   # global env to all steps
-  TOX_WORKERS: -n2
+  TOX_WORKERS: -n4
 
 permissions:
   contents: read
@@ -26,7 +26,7 @@ jobs:
       # run this job using this matrix, excluding some combinations below.
       matrix:
         os:
-          - "ubuntu-latest"
+          - "ubuntu-22.04"
           - "windows-latest"
           - "macos-latest"
           - "macos-13"
@@ -51,15 +51,15 @@ jobs:
           # autocommit tests fail on the ci for some reason
           - python-version: "pypy-3.10"
             pytest-args: "-k 'not test_autocommit_on and not test_turn_autocommit_off_via_default_iso_level and not test_autocommit_isolation_level'"
-          - os: "ubuntu-latest"
+          - os: "ubuntu-22.04"
             pytest-args: "--dbdriver pysqlite --dbdriver aiosqlite"
 
 
         exclude:
           # linux do not have x86 / arm64 python
-          - os: "ubuntu-latest"
+          - os: "ubuntu-22.04"
             architecture: x86
-          - os: "ubuntu-latest"
+          - os: "ubuntu-22.04"
             architecture: arm64
           # windows des not have arm64 python
           - os: "windows-latest"
@@ -119,7 +119,7 @@ jobs:
   run-test-arm64:
     # Hopefully something native can be used at some point https://github.blog/changelog/2023-10-30-accelerate-your-ci-cd-with-arm-based-hosted-runners-in-github-actions/
     name: test-arm64-${{ matrix.python-version }}-${{ matrix.build-type }}-${{ matrix.os }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         python-version:
@@ -164,7 +164,7 @@ jobs:
       # run this job using this matrix, excluding some combinations below.
       matrix:
         os:
-          - "ubuntu-latest"
+          - "ubuntu-22.04"
         python-version:
           - "3.8"
           - "3.9"
@@ -180,7 +180,7 @@ jobs:
           # run lint only on 3.12
           - tox-env: lint
             python-version: "3.12"
-            os: "ubuntu-latest"
+            os: "ubuntu-22.04"
         exclude:
           # run pep484 only on 3.10+
           - tox-env: pep484

diff --git a/pyproject.toml b/pyproject.toml
index f75bf319243ac67a2c3aa96177662eb7d3a05dba..5f3bd34e53242f36857944f764d7526023ed1482 100644 (file)
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -80,7 +80,7 @@ strict = true
 [tool.cibuildwheel]
 test-requires = "pytest pytest-xdist"
 # remove user site, otherwise the local checkout has precedence, disabling cyextensions
-test-command = "python -s -m pytest -c {project}/pyproject.toml -n2 -q --nomemory --notimingintensive --nomypy {project}/test"
+test-command = "python -s -m pytest -c {project}/pyproject.toml -n4 -q --nomemory --notimingintensive --nomypy {project}/test"
 
 build = "*"
 # python 3.6 is no longer supported by sqlalchemy