Skip to content

Commit

Permalink
Merge pull request #413 from nens/eli-bump-github-action-versions
Browse files Browse the repository at this point in the history
bump github action job and runner image versions
  • Loading branch information
elisalle authored Jan 29, 2025
2 parents d4a6981 + 3493861 commit 6de71f1
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 17 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

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

Expand Down
27 changes: 15 additions & 12 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:

steps:
- name: Checkout source
uses: actions/checkout@v3
uses: actions/checkout@v4

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

Expand All @@ -29,8 +29,9 @@ jobs:
pip install build
python -m build
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: artifact-sdist
path: ./dist/*.tar.gz
retention-days: 5

Expand All @@ -40,23 +41,23 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04, windows-2019, macos-13]
os: [ubuntu-24.04, windows-2022, macos-14]

steps:
- name: Checkout source
uses: actions/checkout@v4

- uses: msys2/setup-msys2@v2
if: matrix.os == 'windows-2019'
if: matrix.os == 'windows-2022'

- name: Build wheels
uses: pypa/cibuildwheel@v2.16.5
uses: pypa/cibuildwheel@v2.22.0
# to supply options, put them in 'env', like:
env:
CIBW_SKIP: "pp* *musllinux* cp312" # skips pypy, musllinux and python3.12
CIBW_SKIP: "pp* *musllinux* cp313*" # skips pypy, musllinux and python3.13
CIBW_ARCHS: auto64 # only 64-bit (convincing CMAKE of 32-bit is a TODO)
CIBW_ENVIRONMENT_MACOS:
FC=gfortran-12
FC=gfortran-12 MACOSX_DEPLOYMENT_TARGET=14.0
CIBW_BEFORE_ALL: cat WHEEL_LICENSE_POSIX >> LICENSE
CIBW_BEFORE_ALL_WINDOWS: cat WHEEL_LICENSE_WINDOWS >> LICENSE
CIBW_BEFORE_BUILD_WINDOWS: pip install delvewheel
Expand All @@ -65,8 +66,9 @@ jobs:
--no-mangle "libwinpthread-1.dll" {wheel}
CIBW_BUILD_VERBOSITY: 1

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: artifact-wheel-${{ matrix.os }}
path: ./wheelhouse/*.whl
retention-days: 5

Expand All @@ -77,13 +79,14 @@ jobs:
# release on every tag
if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/')
steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: artifact
pattern: artifact-*
merge-multiple: true
path: dist

- name: Upload Github release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2

- name: Upload Release Assets to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,12 @@ jobs:
use_gdal_36: true

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
lfs: true

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

Expand All @@ -83,7 +83,7 @@ jobs:
run: |
sudo apt-get update && sudo apt-get install --yes --no-install-recommends libgdal-dev sqlite3 libsqlite3-mod-spatialite
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ matrix.python }}-${{ matrix.numpy }}-${{ hashFiles('setup.py') }}
Expand Down

0 comments on commit 6de71f1

Please sign in to comment.