Skip to content

Commit

Permalink
Replace multiple macos versions to just macos-latest universal2 wheel…
Browse files Browse the repository at this point in the history
… builds (#653)
  • Loading branch information
darrylong authored Dec 24, 2024
1 parent 5813a95 commit 5618a1a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [windows-latest, ubuntu-latest, macos-13, macos-14]
os: [windows-latest, ubuntu-latest, macos-latest]
python-version: ["3.9", "3.10", "3.11", "3.12"]
env:
LIMIT_NUMPY_VERSION: 2.0.0
Expand All @@ -29,15 +29,15 @@ jobs:
- uses: actions/checkout@v4

- name: Setup Python ${{ matrix.python-version }}
if: ${{ (matrix.os != 'macos-14') || ((matrix.os == 'macos-14') && (matrix.python-version != '3.9')) }}
if: ${{ ((matrix.os == 'macos-latest') && (matrix.python-version != '3.9')) }}
uses: actions/setup-python@v5
id: pysetup
with:
python-version: ${{ matrix.python-version }}
cache: 'pip'

- name: Setup Python 3.9 - macos-arm
if: ${{ (matrix.os == 'macos-14') && (matrix.python-version == '3.9') }}
if: ${{ (matrix.os == 'macos-latest') && (matrix.python-version == '3.9') }}
run: |
brew update
brew install python@${{ matrix.python-version }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/python-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,21 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [windows-latest, ubuntu-latest, macos-13, macos-14]
os: [windows-latest, ubuntu-latest, macos-latest]
python-version: ["3.9", "3.10", "3.11", "3.12"]
steps:
- uses: actions/checkout@v4

- name: Setup Python ${{ matrix.python-version }}
if: ${{ (matrix.os != 'macos-14') || ((matrix.os == 'macos-14') && (matrix.python-version != '3.9')) }}
if: ${{ ((matrix.os == 'macos-latest') && (matrix.python-version != '3.9')) }}
uses: actions/setup-python@v5
id: pysetup
with:
python-version: ${{ matrix.python-version }}
cache: 'pip'

- name: Setup Python 3.9 - macos-arm
if: ${{ (matrix.os == 'macos-14') && (matrix.python-version == '3.9') }}
if: ${{ (matrix.os == 'macos-latest') && (matrix.python-version == '3.9') }}
run: |
brew update
brew install python@${{ matrix.python-version }}
Expand Down Expand Up @@ -118,7 +118,7 @@ jobs:
with:
user: __token__
password: ${{ secrets.PYPI_API_TOKEN }}
packages_dir: ./dist/
verify_metadata: false
skip_existing: true
packages-dir: ./dist/
verify-metadata: false
skip-existing: true
verbose: true

0 comments on commit 5618a1a

Please sign in to comment.