Fix wrong arch for osx.

# Conflicts: # .github/workflows/test.yml
pytest-dev · Sep 16, 2024 · 0f9cb48 · 0f9cb48
1 parent eb89009
commit 0f9cb48
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -75,7 +75,7 @@ jobs:
           - name: 'py38-pytest81-xdist350-coverage75 (macos)'
             python: '3.8'
             toxpython: 'python3.8'
-            python_arch: 'x64'
+            python_arch: 'arm64'
             tox_env: 'py38-pytest81-xdist350-coverage75'
             os: 'macos-latest'
           - name: 'py38-pytest81-xdist350-coverage76 (ubuntu)'
@@ -93,7 +93,7 @@ jobs:
           - name: 'py38-pytest81-xdist350-coverage76 (macos)'
             python: '3.8'
             toxpython: 'python3.8'
-            python_arch: 'x64'
+            python_arch: 'arm64'
             tox_env: 'py38-pytest81-xdist350-coverage76'
             os: 'macos-latest'
           - name: 'py39-pytest81-xdist350-coverage75 (ubuntu)'
@@ -111,7 +111,7 @@ jobs:
           - name: 'py39-pytest81-xdist350-coverage75 (macos)'
             python: '3.9'
             toxpython: 'python3.9'
-            python_arch: 'x64'
+            python_arch: 'arm64'
             tox_env: 'py39-pytest81-xdist350-coverage75'
             os: 'macos-latest'
           - name: 'py39-pytest81-xdist350-coverage76 (ubuntu)'
@@ -129,7 +129,7 @@ jobs:
           - name: 'py39-pytest81-xdist350-coverage76 (macos)'
             python: '3.9'
             toxpython: 'python3.9'
-            python_arch: 'x64'
+            python_arch: 'arm64'
             tox_env: 'py39-pytest81-xdist350-coverage76'
             os: 'macos-latest'
           - name: 'py310-pytest81-xdist350-coverage75 (ubuntu)'
@@ -147,7 +147,7 @@ jobs:
           - name: 'py310-pytest81-xdist350-coverage75 (macos)'
             python: '3.10'
             toxpython: 'python3.10'
-            python_arch: 'x64'
+            python_arch: 'arm64'
             tox_env: 'py310-pytest81-xdist350-coverage75'
             os: 'macos-latest'
           - name: 'py310-pytest81-xdist350-coverage76 (ubuntu)'
@@ -165,7 +165,7 @@ jobs:
           - name: 'py310-pytest81-xdist350-coverage76 (macos)'
             python: '3.10'
             toxpython: 'python3.10'
-            python_arch: 'x64'
+            python_arch: 'arm64'
             tox_env: 'py310-pytest81-xdist350-coverage76'
             os: 'macos-latest'
           - name: 'py311-pytest81-xdist350-coverage75 (ubuntu)'
@@ -183,7 +183,7 @@ jobs:
           - name: 'py311-pytest81-xdist350-coverage75 (macos)'
             python: '3.11'
             toxpython: 'python3.11'
-            python_arch: 'x64'
+            python_arch: 'arm64'
             tox_env: 'py311-pytest81-xdist350-coverage75'
             os: 'macos-latest'
           - name: 'py311-pytest81-xdist350-coverage76 (ubuntu)'
@@ -201,7 +201,7 @@ jobs:
           - name: 'py311-pytest81-xdist350-coverage76 (macos)'
             python: '3.11'
             toxpython: 'python3.11'
-            python_arch: 'x64'
+            python_arch: 'arm64'
             tox_env: 'py311-pytest81-xdist350-coverage76'
             os: 'macos-latest'
           - name: 'py312-pytest81-xdist350-coverage75 (ubuntu)'
@@ -219,7 +219,7 @@ jobs:
           - name: 'py312-pytest81-xdist350-coverage75 (macos)'
             python: '3.12'
             toxpython: 'python3.12'
-            python_arch: 'x64'
+            python_arch: 'arm64'
             tox_env: 'py312-pytest81-xdist350-coverage75'
             os: 'macos-latest'
           - name: 'py312-pytest81-xdist350-coverage76 (ubuntu)'
@@ -237,7 +237,7 @@ jobs:
           - name: 'py312-pytest81-xdist350-coverage76 (macos)'
             python: '3.12'
             toxpython: 'python3.12'
-            python_arch: 'x64'
+            python_arch: 'arm64'
             tox_env: 'py312-pytest81-xdist350-coverage76'
             os: 'macos-latest'
           - name: 'pypy38-pytest81-xdist350-coverage75 (ubuntu)'
@@ -255,7 +255,7 @@ jobs:
           - name: 'pypy38-pytest81-xdist350-coverage75 (macos)'
             python: 'pypy-3.8'
             toxpython: 'pypy3.8'
-            python_arch: 'x64'
+            python_arch: 'arm64'
             tox_env: 'pypy38-pytest81-xdist350-coverage75'
             os: 'macos-latest'
           - name: 'pypy38-pytest81-xdist350-coverage76 (ubuntu)'
@@ -273,7 +273,7 @@ jobs:
           - name: 'pypy38-pytest81-xdist350-coverage76 (macos)'
             python: 'pypy-3.8'
             toxpython: 'pypy3.8'
-            python_arch: 'x64'
+            python_arch: 'arm64'
             tox_env: 'pypy38-pytest81-xdist350-coverage76'
             os: 'macos-latest'
           - name: 'pypy39-pytest81-xdist350-coverage75 (ubuntu)'
@@ -291,7 +291,7 @@ jobs:
           - name: 'pypy39-pytest81-xdist350-coverage75 (macos)'
             python: 'pypy-3.9'
             toxpython: 'pypy3.9'
-            python_arch: 'x64'
+            python_arch: 'arm64'
             tox_env: 'pypy39-pytest81-xdist350-coverage75'
             os: 'macos-latest'
           - name: 'pypy39-pytest81-xdist350-coverage76 (ubuntu)'
@@ -309,7 +309,7 @@ jobs:
           - name: 'pypy39-pytest81-xdist350-coverage76 (macos)'
             python: 'pypy-3.9'
             toxpython: 'pypy3.9'
-            python_arch: 'x64'
+            python_arch: 'arm64'
             tox_env: 'pypy39-pytest81-xdist350-coverage76'
             os: 'macos-latest'
           - name: 'pypy310-pytest81-xdist350-coverage75 (ubuntu)'
@@ -327,7 +327,7 @@ jobs:
           - name: 'pypy310-pytest81-xdist350-coverage75 (macos)'
             python: 'pypy-3.10'
             toxpython: 'pypy3.10'
-            python_arch: 'x64'
+            python_arch: 'arm64'
             tox_env: 'pypy310-pytest81-xdist350-coverage75'
             os: 'macos-latest'
           - name: 'pypy310-pytest81-xdist350-coverage76 (ubuntu)'
@@ -345,7 +345,7 @@ jobs:
           - name: 'pypy310-pytest81-xdist350-coverage76 (macos)'
             python: 'pypy-3.10'
             toxpython: 'pypy3.10'
-            python_arch: 'x64'
+            python_arch: 'arm64'
             tox_env: 'pypy310-pytest81-xdist350-coverage76'
             os: 'macos-latest'
     steps:

diff --git a/ci/templates/.github/workflows/test.yml b/ci/templates/.github/workflows/test.yml
@@ -77,7 +77,7 @@ jobs:
 {% for os, python_arch in [
     ['ubuntu', 'x64'],
     ['windows', 'x64'],
-    ['macos', 'x64'],
+    ['macos', 'arm64'],
 ] %}
           - name: '{{ env }} ({{ os }})'
             python: '{{ python }}'