Skip to content

Commit

Permalink
Run Tests also on M1 macOS runner and update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
schroedtert committed Feb 6, 2024
1 parent 8a7a069 commit 0bcaace
Showing 1 changed file with 23 additions and 20 deletions.
43 changes: 23 additions & 20 deletions .github/workflows/cibuildwheel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
uses: actions/checkout@v4

- name: Set up Python 3.11
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.11"
- name: Install dependencies
Expand All @@ -44,7 +44,7 @@ jobs:
uses: actions/checkout@v4

- name: Set up Python 3.11
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.11"
- name: Install dependencies
Expand All @@ -64,7 +64,7 @@ jobs:
uses: actions/checkout@v4

- name: Set up Python 3.11
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.11"

Expand Down Expand Up @@ -102,7 +102,7 @@ jobs:
keep_files: false

- name: Upload documentation as artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: pages
path: docs/build/
Expand Down Expand Up @@ -157,7 +157,7 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
name: Install Python
with:
python-version: 3.11
Expand All @@ -170,9 +170,9 @@ jobs:
python -m build -s
- name: Upload sdist
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: python-packages
name: python-packages-sdist
path: dist/jupedsim-*.tar.gz
if-no-files-found: error

Expand Down Expand Up @@ -231,9 +231,9 @@ jobs:
CIBW_BUILD: ${{ matrix.cibw_build }}
CIBW_ARCHS: ${{ matrix.cibw_archs }}

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: python-packages
name: python-packages-${{ matrix.os }}-${{ matrix.cibw_archs }}-${{ strategy.job-index }}
path: ./wheelhouse/*.whl
if-no-files-found: error

Expand All @@ -243,19 +243,20 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
os: [ubuntu-latest, windows-latest, macos-latest, macos-14]
python-version: ["3.10", "3.11", "3.12"]

steps:
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

- name: Download packages
uses: actions/Download-artifact@v3
uses: actions/Download-artifact@v4
with:
name: python-packages
pattern: python-packages-*
merge-multiple: true
path: dist

- name: Install wheel
Expand All @@ -274,14 +275,15 @@ jobs:

steps:
- name: Set up Python 3.12
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.12

- name: Download packages
uses: actions/Download-artifact@v3
uses: actions/Download-artifact@v4
with:
name: python-packages
pattern: python-packages-*
merge-multiple: true
path: dist

- name: Install wheel
Expand All @@ -294,7 +296,7 @@ jobs:
python -c "import jupedsim; print(jupedsim.__version__)"
pypi-publish:
needs: [build_wheels, build_sdist]
needs: [test-wheels, test-sdist]
if: ${{ github.event_name == 'release' && github.event.action == 'released' }}
name: Publish to PyPI
runs-on: ubuntu-latest
Expand All @@ -303,10 +305,11 @@ jobs:
id-token: write
steps:
# retrieve your distributions here
- name: Download paackages
uses: actions/Download-artifact@v3
- name: Download packages
uses: actions/Download-artifact@v4
with:
name: python-packages
pattern: python-packages-*
merge-multiple: true

- name: Publish package distributions to PyPI
uses: pypa/gh-action-pypi-publish@release/v1

0 comments on commit 0bcaace

Please sign in to comment.