change matrix and use macos-13 for Intel hardware

spacetelescope · Apr 29, 2024 · 3e2b4d1 · 3e2b4d1
1 parent 4faf0cf
commit 3e2b4d1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 51 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -32,7 +32,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        runs-on: [ ubuntu-latest, macos-latest, macos-14 ]
+        # the macOS 13 runner is on Intel hardware
+        runs-on: [ ubuntu-latest, macos-13, macos-latest ]
         python-version: [ '3.10', '3.11', '3.12' ]
     runs-on: ${{ matrix.runs-on }}
     name: build (Python ${{ matrix.python-version }}, ${{ matrix.runs-on }})

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -27,7 +27,8 @@ jobs:
     strategy:
       matrix:
         package: [ acstools, asdf, calcos, ccdproc, costools, synphot, jwst ]
-        runs-on: [ ubuntu-latest, macos-latest, macos-14 ]
+        # the macOS 13 runner is on Intel hardware
+        runs-on: [ ubuntu-latest, macos-13, macos-latest ]
         python-version: [ '3.10', '3.11', '3.12' ]
         include:
           - package: acstools
@@ -56,15 +57,6 @@ jobs:
             args: --slow -k "not test_cmdline_status"
             env:
               CRDS_SERVER_URL: https://jwst-crds.stsci.edu
-        exclude:
-          - runs-on: macos-latest
-            python-version: '3.10'
-          - runs-on: macos-latest
-            python-version: '3.11'
-          - runs-on: macos-14
-            python-version: '3.10'
-          - runs-on: macos-14
-            python-version: '3.11'
       fail-fast: false
     runs-on: ${{ matrix.runs-on }}
     name: ${{ matrix.package }} (Python ${{ matrix.python-version }}, tox ${{ matrix.default_factors }}${{ matrix.args != '' && ' -- ' || '' }}${{ matrix.args }}, ${{ matrix.runs-on }})
@@ -122,23 +114,15 @@ jobs:
       fail-fast: false
       matrix:
         package: [ reftools, wfpc2tools ]
-        runs-on: [ ubuntu-latest, macos-latest, macos-14 ]
+        # the macOS 13 runner is on Intel hardware
+        runs-on: [ ubuntu-latest, macos-13, macos-latest ]
         python-version: [ '3.10', '3.11', '3.12' ]
         include:
           #- package: pysynphot
           #  extras: [ test ]
           - package: reftools
             extras: [ test ]
           - package: wfpc2tools
-        exclude:
-          - runs-on: macos-latest
-            python-version: '3.10'
-          - runs-on: macos-latest
-            python-version: '3.11'
-          - runs-on: macos-14
-            python-version: '3.10'
-          - runs-on: macos-14
-            python-version: '3.11'
     runs-on: ${{ matrix.runs-on }}
     name: ${{ matrix.package }} (Python ${{ matrix.python-version }}, ${{ matrix.runs-on }})
     steps:
@@ -177,7 +161,8 @@ jobs:
     strategy:
       matrix:
         package: [ hstcal ]
-        runs-on: [ ubuntu-latest, macos-latest, macos-14 ]
+        # the macOS 13 runner is on Intel hardware
+        runs-on: [ ubuntu-latest, macos-13, macos-latest ]
         python-version: [ '3.10', '3.11', '3.12' ]
         include:
           #- package: drizzlepac
@@ -194,15 +179,6 @@ jobs:
           # - package: stsynphot
           #   repository: spacetelescope/stsynphot_refactor
           #   extras: [ test ]
-        exclude:
-          - runs-on: macos-latest
-            python-version: '3.10'
-          - runs-on: macos-latest
-            python-version: '3.11'
-          - runs-on: macos-14
-            python-version: '3.10'
-          - runs-on: macos-14
-            python-version: '3.11'
       fail-fast: false
     runs-on: ${{ matrix.runs-on }}
     name: ${{ matrix.package }} (Python ${{ matrix.python-version }}, ${{ matrix.runs-on }})
@@ -265,20 +241,12 @@ jobs:
       fail-fast: false
       matrix:
         package: [ crds ]
-        runs-on: [ ubuntu-latest, macos-latest, macos-14 ]
+        # the macOS 13 runner is on Intel hardware
+        runs-on: [ ubuntu-latest, macos-13, macos-latest ]
         python-version: [ '3.10', '3.11', '3.12' ]
         include:
           - package: crds
             repository: spacetelescope/crds
-        exclude:
-          - runs-on: macos-latest
-            python-version: '3.10'
-          - runs-on: macos-latest
-            python-version: '3.11'
-          - runs-on: macos-14
-            python-version: '3.10'
-          - runs-on: macos-14
-            python-version: '3.11'
     runs-on: ${{ matrix.runs-on }}
     name: ${{ matrix.package }} (Python ${{ matrix.python-version }}, ${{ matrix.runs-on }})
     steps:
@@ -327,7 +295,8 @@ jobs:
     strategy:
       matrix:
         package: [ calcos, drizzlepac ]
-        runs-on: [ ubuntu-latest, macos-latest, macos-14 ]
+        # the macOS 13 runner is on Intel hardware
+        runs-on: [ ubuntu-latest, macos-13, macos-latest ]
         python-version: [ '3.10', '3.11', '3.12' ]
         include:
           - package: calcos
@@ -340,15 +309,6 @@ jobs:
             env:
               CRDS_SERVER_URL: https://hst-crds.stsci.edu
               jref: hst/references/hst/
-        exclude:
-          - runs-on: macos-latest
-            python-version: '3.10'
-          - runs-on: macos-latest
-            python-version: '3.11'
-          - runs-on: macos-14
-            python-version: '3.10'
-          - runs-on: macos-14
-            python-version: '3.11'
       fail-fast: false
     runs-on: ${{ matrix.runs-on }}
     name: ${{ matrix.package }} (Python ${{ matrix.python-version }}, ${{ matrix.runs-on }})