From: Federico Caselli <cfederico87@gmail.com>
Date: Tue, 24 Dec 2024 21:39:58 +0000 (+0100)
Subject: pin ubuntu 22 since 24 seems broken. Runners have 4 cores now
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d73205f352e68c6603e90494494ef21027ec68f;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

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

Change-Id: Ie62b072446e8052d5465cfe2c01b2ccb05482aba
---

diff --git a/.github/workflows/run-on-pr.yaml b/.github/workflows/run-on-pr.yaml
index aa67872e32..0d1313bf39 100644
--- 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 133997b5d3..f3ff016c4a 100644
--- 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"
@@ -49,15 +49,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"
@@ -113,7 +113,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:
@@ -156,7 +156,7 @@ jobs:
       # run this job using this matrix, excluding some combinations below.
       matrix:
         os:
-          - "ubuntu-latest"
+          - "ubuntu-22.04"
         python-version:
           - "3.9"
           - "3.10"
@@ -171,7 +171,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 eebbd725bc..7e6b12b37a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -197,7 +197,7 @@ ignore_missing_imports = 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, 3.7 are no longer supported by sqlalchemy