Skip to content

Commit

Permalink
test macos wheels (#458)
Browse files Browse the repository at this point in the history
* test macos wheels

* test x86-64 runner

* exclude unwanted combinations

* test macos 13

* old udunits config

* macosx_deployment_target

* mdt 14

* different mdt's

* try setting mdt

* 2

* macos 13

* add mdt

* try pyproj

* wheels run

* mdt env set

* remove pyproj config

* wheels run

* fix yaml

* undo changes

* undo change

* add workflow_dispatch

* missed comma

* pyproj 2

* add new step

* remove pyproj

* add macos back to tests

* fetch depth 0
  • Loading branch information
HGWright authored Sep 19, 2024
1 parent 3dbf929 commit c9a721c
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 19 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/ci-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,14 @@ jobs:
version: py311
posargs: "--cov-report=xml --cov"
post-command: codecov
# TODO: enable macos support
# - os: macos-latest
# version: py311
# platform: osx
- os: macos-latest
version: py311
platform: osx
steps:
- name: "Checkout"
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: "Environment configure"
env:
Expand Down
39 changes: 24 additions & 15 deletions .github/workflows/ci-wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,46 +20,55 @@ on:
- "pre-commit-ci-update-config"
- "dependabot/*"

workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
build_bdist:
name: "Build ${{ matrix.os }} (${{ matrix.arch }}) wheels"
# TBD: extend to support windows
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
# TBD: extend to support windows
# TODO: enable macos support
os: ["ubuntu-latest"] # "macos-latest"
os: ["ubuntu-latest", "macos-latest", "macos-13"]
arch: ["x86_64", "arm64"]
include:
- os: ubuntu-latest
arch: x86_64
incdir: /usr/include/udunits2
libdir: /usr/lib64
xml_path: /usr/share/udunits/udunits2.xml
# - os: macos-latest
# arch: x86_64
# incdir: /usr/local/Cellar/udunits/2.2.28/include
# libdir: /usr/local/Cellar/udunits/2.2.28/lib
# xml_path: /usr/local/Cellar/udunits/2.2.28/share/udunits/udunits2-common.xml
# - os: macos-latest
# arch: arm64
# incdir: /opt/homebrew/Cellar/udunits/2.2.28/include
# libdir: /opt/homebrew/Cellar/udunits/2.2.28/lib
# xml_path: /opt/homebrew/Cellar/udunits/2.2.28/share/udunits/udunits2-common.xml
exclude:
- os: ubuntu-latest
- os: macos-13
arch: x86_64
incdir: /usr/local/Cellar/udunits/2.2.28/include
libdir: /usr/local/Cellar/udunits/2.2.28/lib
xml_path: /usr/local/Cellar/udunits/2.2.28/share/udunits/udunits2-common.xml
- os: macos-latest
arch: arm64
incdir: /opt/homebrew/Cellar/udunits/2.2.28/include
libdir: /opt/homebrew/Cellar/udunits/2.2.28/lib
xml_path: /opt/homebrew/Cellar/udunits/2.2.28/share/udunits/udunits2-common.xml
exclude:
- os: "ubuntu-latest"
arch: "arm64"
- os: "macos-latest"
arch: "x86_64"
- os: "macos-13"
arch: "arm64"

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0

- name: "Set MACOSX_DEPLOYMENT_TARGET"
if: startsWith(matrix.os, 'macos')
run: echo "MACOSX_DEPLOYMENT_TARGET=$([[ ${{ matrix.os }} == 'macos-latest' ]] && echo '14.0' || echo '13.0')" >> $GITHUB_ENV

- name: "Building ${{ matrix.os }} (${{ matrix.arch }}) wheels"
uses: pypa/[email protected]
env:
Expand Down

0 comments on commit c9a721c

Please sign in to comment.