Merge pull request #86 from jwodder/arm-mac-ci

Update macOS tests for Sonoma runner
jwodder · Apr 23, 2024 · a06bede · a06bede
2 parents 48c2c93 + 5779c9b
commit a06bede
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 1 deletion.
diff --git a/.github/workflows/install-git-url.yml b/.github/workflows/install-git-url.yml
@@ -37,6 +37,16 @@ jobs:
           - 'pypy-3.8'
           - 'pypy-3.9'
           - 'pypy-3.10'
+        exclude:
+          # Not available for ARM macOS:
+          - python-version: '3.7'
+            os: macos-latest
+          - python-version: '3.8'
+            os: macos-latest
+          - python-version: '3.9'
+            os: macos-latest
+          - python-version: 'pypy-3.7'
+            os: macos-latest
     steps:
       - name: Check out repository
         uses: actions/checkout@v4

diff --git a/.github/workflows/install-zip-url.yml b/.github/workflows/install-zip-url.yml
@@ -37,6 +37,16 @@ jobs:
           - 'pypy-3.8'
           - 'pypy-3.9'
           - 'pypy-3.10'
+        exclude:
+          # Not available for ARM macOS:
+          - python-version: '3.7'
+            os: macos-latest
+          - python-version: '3.8'
+            os: macos-latest
+          - python-version: '3.9'
+            os: macos-latest
+          - python-version: 'pypy-3.7'
+            os: macos-latest
     steps:
       - name: Check out repository
         uses: actions/checkout@v4

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -44,6 +44,16 @@ jobs:
           - python-version: '3.7'
             toxenv: py-oldsetup
             os: ubuntu-latest
+        exclude:
+          # Not available for ARM macOS:
+          - python-version: '3.7'
+            os: macos-latest
+          - python-version: '3.8'
+            os: macos-latest
+          - python-version: '3.9'
+            os: macos-latest
+          - python-version: 'pypy-3.7'
+            os: macos-latest
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
@@ -52,7 +62,7 @@ jobs:
         # Mercurial seems to be broken on PyPy, so we need to install it before
         # overriding the default Python.
         if: startsWith(matrix.os, 'macos-')
-        run: python3 -m pip install mercurial
+        run: brew install mercurial
 
       - name: Set up Python
         uses: actions/setup-python@v5