Skip to content

Commit

Permalink
Add macOS 14 to CI (#563)
Browse files Browse the repository at this point in the history
  • Loading branch information
EnricoMi authored Feb 3, 2024
1 parent 4e12145 commit 04f29da
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 6 deletions.
17 changes: 16 additions & 1 deletion .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,34 @@ jobs:
name: "Test macOS"
uses: "./.github/workflows/test-os.yml"
with:
os: '["macos-11", "macos-12", "macos-13"]'
os: '["macos-11", "macos-12", "macos-13", "macos-14"]'
python-version: '["3.10", "3.11", "3.12.0-rc.3", "installed"]'
include: >
[
{"os": "macos-11", "python-version": "3.7"},
{"os": "macos-11", "python-version": "3.8"},
{"os": "macos-11", "python-version": "3.9"},
{"os": "macos-12", "python-version": "3.8"},
{"os": "macos-12", "python-version": "3.9"},
{"os": "macos-13", "python-version": "3.8"},
{"os": "macos-13", "python-version": "3.9"},
]
test-lnx:
name: "Test Ubuntu"
uses: "./.github/workflows/test-os.yml"
with:
os: '["ubuntu-20.04", "ubuntu-22.04"]'
python-version: '["3.8", "3.9", "3.10", "3.11", "3.12.0-rc.3", "installed"]'
include: '[{"os": "ubuntu-20.04", "python-version": "3.7"}]'

test-win:
name: "Test Windows"
uses: "./.github/workflows/test-os.yml"
with:
os: '["windows-2019", "windows-2022"]'
python-version: '["3.8", "3.9", "3.10", "3.11", "3.12.0-rc.3", "installed"]'
include: '[{"os": "windows-2019", "python-version": "3.7"}]'

publish:
name: "Publish"
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,12 @@ jobs:
- os: macos-11
os-label: macOS 11
python: "installed"
- os: macos-13
os-label: macOS 13
python: "installed"
- os: macos-14
os-label: macOS 14
python: "installed"

- os: ubuntu-latest
os-label: Linux
Expand Down
13 changes: 8 additions & 5 deletions .github/workflows/test-os.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ on:
os:
required: true
type: string
python-version:
required: true
type: string
include:
required: true
type: string
jobs:
test:
name: Test (python-${{ matrix.python-version }}, ${{ matrix.os }})
Expand All @@ -14,11 +20,8 @@ jobs:
fail-fast: false
matrix:
os: ${{ fromJson(inputs.os) }}
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12.0-rc.3", "installed"]

include:
- os: ${{ fromJson(inputs.os)[0] }}
python-version: "3.7"
python-version: ${{ fromJson(inputs.python-version) }}
include: ${{ fromJson(inputs.include) }}

steps:
- name: Checkout
Expand Down

0 comments on commit 04f29da

Please sign in to comment.