use arm runnes on linux instead of emulation

Fixes: #12249
Change-Id: I4c56a10d09716aa5e1fc4a1688dbfdf7cfcfd2fb
(cherry picked from commit 1f704fb682a0759454a474901b33e0b311044253)

# Conflicts:
#	.github/workflows/run-test.yaml

diff --git a/.github/workflows/create-wheels.yaml b/.github/workflows/create-wheels.yaml
index b8e6adffeb1ad2c2b23c85d0f3f1772597e9819b..e3089cd2d1b99ec293a981917e951ca6eb0682b4 100644 (file)
--- a/.github/workflows/create-wheels.yaml
+++ b/.github/workflows/create-wheels.yaml
@@ -30,6 +30,7 @@ jobs:
           # TODO: macos-14 uses arm macs (only python 3.10+) - make arm wheel on it
           - "macos-13"
           - "ubuntu-22.04"
+          - "ubuntu-22.04-arm"
         linux_archs:
           # this is only meaningful on linux. windows and macos ignore exclude all but one arch
           - "aarch64"
@@ -39,13 +40,17 @@ jobs:
           # create pure python build
           - os: ubuntu-22.04
             wheel_mode: pure-python
-            python: "cp-311*"
+            python: "cp-312*"
 
         exclude:
           - os: "windows-2022"
             linux_archs: "aarch64"
           - os: "macos-13"
             linux_archs: "aarch64"
+          - os: "ubuntu-22.04"
+            linux_archs: "aarch64"
+          - os: "ubuntu-22.04-arm"
+            linux_archs: "x86_64"
 
       fail-fast: false
 
@@ -66,11 +71,12 @@ jobs:
           (cat setup.cfg) | %{$_ -replace "tag_build.?=.?dev",""} | set-content setup.cfg
 
       # See details at https://cibuildwheel.readthedocs.io/en/stable/faq/#emulation
-      - name: Set up QEMU on linux
-        if: ${{ runner.os == 'Linux' }}
-        uses: docker/setup-qemu-action@v3
-        with:
-          platforms: all
+      # no longer needed since arm runners are now available
+      # - name: Set up QEMU on linux
+      #   if: ${{ runner.os == 'Linux' }}
+      #   uses: docker/setup-qemu-action@v3
+      #   with:
+      #     platforms: all
 
       - name: Build compiled wheels
         if: ${{ matrix.wheel_mode == 'compiled' }}

diff --git a/.github/workflows/run-test.yaml b/.github/workflows/run-test.yaml
index c037b91237f5d061bf7f17d60ed72124ebc4b30c..ea1540edc1bbafdfe21aca674e683395ac0e3491 100644 (file)
--- a/.github/workflows/run-test.yaml
+++ b/.github/workflows/run-test.yaml
@@ -20,13 +20,14 @@ permissions:
 
 jobs:
   run-test:
-    name: test-${{ matrix.python-version }}-${{ matrix.build-type }}-${{ matrix.architecture }}-${{ matrix.os }}
+    name: test-${{ matrix.python-version }}-${{ matrix.os }}-${{ matrix.architecture }}-${{ matrix.build-type }}
     runs-on: ${{ matrix.os }}
     strategy:
       # run this job using this matrix, excluding some combinations below.
       matrix:
         os:
           - "ubuntu-22.04"
+          - "ubuntu-22.04-arm"
           - "windows-latest"
           - "macos-latest"
           - "macos-13"
@@ -37,7 +38,7 @@ jobs:
           - "3.10"
           - "3.11"
           - "3.12"
-          - "3.13.0-alpha - 3.13"
+          - "3.13"
           - "pypy-3.10"
         build-type:
           - "cext"
@@ -53,6 +54,8 @@ jobs:
             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-22.04"
             pytest-args: "--dbdriver pysqlite --dbdriver aiosqlite"
+          - os: "ubuntu-22.04-arm"
+            pytest-args: "--dbdriver pysqlite --dbdriver aiosqlite"
 
 
         exclude:
@@ -61,6 +64,11 @@ jobs:
             architecture: x86
           - os: "ubuntu-22.04"
             architecture: arm64
+          # linux-arm do not have x86 / x64 python
+          - os: "ubuntu-22.04-arm"
+            architecture: x86
+          - os: "ubuntu-22.04-arm"
+            architecture: x64
           # windows des not have arm64 python
           - os: "windows-latest"
             architecture: arm64
@@ -80,9 +88,11 @@ jobs:
             architecture: arm64
           - os: "macos-13"
             architecture: x86
-          # pypy does not have cext or x86
+          # pypy does not have cext or x86 or arm on linux
           - python-version: "pypy-3.10"
             build-type: "cext"
+          - os: "ubuntu-22.04-arm"
+            python-version: "pypy-3.10"
           - os: "windows-latest"
             python-version: "pypy-3.10"
             architecture: x86
@@ -171,7 +181,7 @@ jobs:
           - "3.10"
           - "3.11"
           - "3.12"
-          - "3.13.0-alpha - 3.13"
+          - "3.13"
         tox-env:
           - mypy
           - pep484