Skip to content

Commit

Permalink
ci: Use Apple silicon for the default macOS runners (#2471)
Browse files Browse the repository at this point in the history
* Use the 'macos-latest' runs-on option which now defaults to 'macos-14' which are
  Apple silicon runners.
   - c.f. https://github.com/actions/runner-images/blob/e63a194563cb0bb3bc1493144fe0ef6804249b43/images/macos/macos-14-arm64-Readme.md
* Keep a 'macos-13' runners to continue to test Intel based macOS for the
  latest Python version.
   - c.f. https://github.com/actions/runner-images/blob/e63a194563cb0bb3bc1493144fe0ef6804249b43/images/macos/macos-13-Readme.md
* Updates PR #2468
  • Loading branch information
matthewfeickert committed Apr 26, 2024
1 parent 8260852 commit f561f86
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
11 changes: 5 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,10 @@ jobs:
os: [ubuntu-latest]
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
include:
# macos-latest runners are Apple silicon
- os: macos-13
- os: macos-latest
python-version: '3.12'
# Apple silicon runner
- os: macos-14
# Intel runner
- os: macos-13
python-version: '3.12'

steps:
Expand Down Expand Up @@ -97,11 +96,11 @@ jobs:

- name: Test docstring examples with doctest
# TODO: Don't currently try to match amd64 and arm64 floating point for docs, but will in the future.
if: matrix.python-version == '3.12' && matrix.os != 'macos-14'
if: matrix.python-version == '3.12' && matrix.os != 'macos-latest'
run: coverage run --data-file=.coverage-doctest --module pytest src/ README.rst

- name: Coverage report for doctest only
if: matrix.python-version == '3.12' && matrix.os != 'macos-14'
if: matrix.python-version == '3.12' && matrix.os != 'macos-latest'
run: |
coverage report --data-file=.coverage-doctest
coverage xml --data-file=.coverage-doctest -o doctest-coverage.xml
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/dependencies-head.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
# macos-latest runners are Apple silicon
os: [ubuntu-latest, macos-13]
os: [ubuntu-latest, macos-latest, macos-13]
python-version: ['3.12']

steps:
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/release_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ jobs:
os: [ubuntu-latest]
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
include:
# macos-latest runners are Apple silicon
- os: macos-latest
python-version: '3.12'
# Intel runner
- os: macos-13
python-version: '3.12'

Expand All @@ -35,7 +37,7 @@ jobs:
- name: Install from PyPI
run: |
python -m pip install --upgrade pip setuptools wheel
python -m pip install --pre pyhf[backends,xmlio]
python -m pip install --pre 'pyhf[backends,xmlio]'
python -m pip install pytest
python -m pip list
Expand Down

0 comments on commit f561f86

Please sign in to comment.