Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ci: Use Apple silicon for the default macOS runners #2471

Merged
merged 1 commit into from
Apr 26, 2024
Merged

ci: Use Apple silicon for the default macOS runners #2471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions .github/workflows/ci.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading