Skip to content

Commit 031919c

Browse files
committed
Add macos builds
1 parent 8441add commit 031919c

File tree

1 file changed

+21
-6
lines changed

1 file changed

+21
-6
lines changed

.github/workflows/wheels.yml

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -281,13 +281,28 @@ jobs:
281281
path: "**/*.log"
282282
retention-days: 2
283283
build-macos:
284-
runs-on: macos-13
284+
runs-on: ${{ matrix.config.runner }}
285285
strategy:
286286
fail-fast: false
287287
matrix:
288288
config:
289-
- py_platform: macosx-10.9-x86_64
289+
- py_platform: macosx-12.0-x86_64
290290
python_version: "3.12"
291+
arch: x64
292+
runner: macos-13
293+
- py_platform: macosx-12.0-x86_64
294+
python_version: "3.13"
295+
arch: x64
296+
runner: macos-13
297+
- py_platform: macosx-12.0-arm64
298+
python_version: "3.12"
299+
arch: arm64
300+
runner: macos-14
301+
- py_platform: macosx-12.0-arm64
302+
python_version: "3.13"
303+
arch: arm64
304+
runner: macos-14
305+
291306
steps:
292307
- uses: actions/checkout@v2
293308
with:
@@ -304,10 +319,10 @@ jobs:
304319
with:
305320
pkgs: >-
306321
${{ env.VCPKG_PKGS }}
307-
triplet: x64-osx-dynamic-release
322+
triplet: ${{ matrix.config.arch }}-osx-dynamic-release
308323
extra-args: --clean-after-build --overlay-triplets=${{ github.workspace }}/ws/src/tesseract_python/.github/workflows/vcpkg_triplets
309324
token: ${{ github.token }}
310-
cache-key: osx-x64-vcpkg
325+
cache-key: osx-${{ matrix.config.arch }}-vcpkg
311326
github-binarycache: true
312327
- name: pip3
313328
run: |
@@ -318,8 +333,8 @@ jobs:
318333
- name: colcon build
319334
working-directory: ws
320335
run: |
321-
export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$GITHUB_WORKSPACE/vcpkg/installed/x64-osx-dynamic-release/lib:$GITHUB_WORKSPACE/ws/install/lib
322-
export CMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/vcpkg/installed/x64-osx-dynamic-release
336+
export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$GITHUB_WORKSPACE/vcpkg/installed/${{ matrix.config.arch }}-osx-dynamic-release/lib:$GITHUB_WORKSPACE/ws/install/lib
337+
export CMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/vcpkg/installed/${{ matrix.config.arch }}-osx-dynamic-release
323338
324339
colcon build --merge-install \
325340
--packages-ignore tesseract_examples trajopt_ifopt trajopt_sqp ifopt vhacd \

0 commit comments

Comments
 (0)