Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 52 additions & 52 deletions .github/workflows/wheel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -227,57 +227,57 @@ jobs:
# macOS Wheels
# ---------------------------------------------------------------------------

macos:
name: Build wheels on macOS
runs-on: macos-13
if: |
github.event_name != 'schedule' ||
github.repository == 'AcademySoftwareFoundation/OpenImageIO'
strategy:
matrix:
include:
# -------------------------------------------------------------------
# CPython 64 bits
# -------------------------------------------------------------------
- build: CPython 3.9 64 bits
python: cp39-macosx_x86_64
arch: x86_64
- build: CPython 3.10 64 bits
python: cp310-macosx_x86_64
arch: x86_64
- build: CPython 3.11 64 bits
python: cp311-macosx_x86_64
arch: x86_64
- build: CPython 3.12 64 bits
python: cp312-macosx_x86_64
arch: x86_64
- build: CPython 3.13 64 bits
python: cp313-macosx_x86_64
arch: x86_64

steps:
- name: Checkout repo
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Install Python
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
python-version: '3.9'

- name: Build wheels
uses: pypa/cibuildwheel@d4a2945fcc8d13f20a1b99d461b8e844d5fc6e23 # v2.21.1
env:
CIBW_BUILD: ${{ matrix.python }}
CIBW_ARCHS: ${{ matrix.arch }}
CMAKE_GENERATOR: "Unix Makefiles"
# TODO: Re-enable HEIF when we provide a build recipe that does
# not include GPL-licensed dynamic libraries.
USE_Libheif: 'OFF'

- uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
with:
name: cibw-wheels-${{ matrix.python }}
path: ./wheelhouse/*.whl
# macos:
# name: Build wheels on macOS
# runs-on: macos-13
# if: |
# github.event_name != 'schedule' ||
# github.repository == 'AcademySoftwareFoundation/OpenImageIO'
Comment on lines +233 to +235
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just as an FYI, I think you could just change this to

Suggested change
# if: |
# github.event_name != 'schedule' ||
# github.repository == 'AcademySoftwareFoundation/OpenImageIO'
if: |
0 && (github.event_name != 'schedule' ||
github.repository == 'AcademySoftwareFoundation/OpenImageIO)'

and not need to comment out the whole thing. Or even only do it if the branch name is something special, so it would only run for you while you're continuing to test, but not for anyone else.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ooohhh, smart...

Unless you feel otherwise, I think I'd rather leave it as-is, just to make it super apparent what was changed, and that I intend to change it back; but I'm happy to do whatever you feel is best.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No problem, I will merge as-is.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for showing me this, btw -- I've been using this trick to quickly "solo" the macos-x86 wheels tasks to help me debug #4855

# strategy:
# matrix:
# include:
# # -------------------------------------------------------------------
# # CPython 64 bits
# # -------------------------------------------------------------------
# - build: CPython 3.9 64 bits
# python: cp39-macosx_x86_64
# arch: x86_64
# - build: CPython 3.10 64 bits
# python: cp310-macosx_x86_64
# arch: x86_64
# - build: CPython 3.11 64 bits
# python: cp311-macosx_x86_64
# arch: x86_64
# - build: CPython 3.12 64 bits
# python: cp312-macosx_x86_64
# arch: x86_64
# - build: CPython 3.13 64 bits
# python: cp313-macosx_x86_64
# arch: x86_64

# steps:
# - name: Checkout repo
# uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

# - name: Install Python
# uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
# with:
# python-version: '3.9'

# - name: Build wheels
# uses: pypa/cibuildwheel@d4a2945fcc8d13f20a1b99d461b8e844d5fc6e23 # v2.21.1
# env:
# CIBW_BUILD: ${{ matrix.python }}
# CIBW_ARCHS: ${{ matrix.arch }}
# CMAKE_GENERATOR: "Unix Makefiles"
# # TODO: Re-enable HEIF when we provide a build recipe that does
# # not include GPL-licensed dynamic libraries.
# USE_Libheif: 'OFF'

# - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
# with:
# name: cibw-wheels-${{ matrix.python }}
# path: ./wheelhouse/*.whl

# ---------------------------------------------------------------------------
# macOS ARM Wheels
Expand Down Expand Up @@ -389,7 +389,7 @@ jobs:


upload_pypi:
needs: [sdist, linux, linux-arm, macos, macos-arm, windows]
needs: [sdist, linux, linux-arm, macos-arm, windows]
runs-on: ubuntu-latest
permissions:
id-token: write
Expand Down
Loading