diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 147ff55b1d..2d1c3f3217 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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: @@ -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 diff --git a/.github/workflows/dependencies-head.yml b/.github/workflows/dependencies-head.yml index 28b561e526..96f1863760 100644 --- a/.github/workflows/dependencies-head.yml +++ b/.github/workflows/dependencies-head.yml @@ -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: diff --git a/.github/workflows/release_tests.yml b/.github/workflows/release_tests.yml index 626854329c..83b42ef02a 100644 --- a/.github/workflows/release_tests.yml +++ b/.github/workflows/release_tests.yml @@ -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' @@ -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