@@ -281,13 +281,28 @@ jobs:
281
281
path : " **/*.log"
282
282
retention-days : 2
283
283
build-macos :
284
- runs-on : macos-13
284
+ runs-on : ${{ matrix.config.runner }}
285
285
strategy :
286
286
fail-fast : false
287
287
matrix :
288
288
config :
289
- - py_platform : macosx-10.9 -x86_64
289
+ - py_platform : macosx-12.0 -x86_64
290
290
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
+
291
306
steps :
292
307
- uses : actions/checkout@v2
293
308
with :
@@ -304,10 +319,10 @@ jobs:
304
319
with :
305
320
pkgs : >-
306
321
${{ env.VCPKG_PKGS }}
307
- triplet : x64 -osx-dynamic-release
322
+ triplet : ${{ matrix.config.arch }} -osx-dynamic-release
308
323
extra-args : --clean-after-build --overlay-triplets=${{ github.workspace }}/ws/src/tesseract_python/.github/workflows/vcpkg_triplets
309
324
token : ${{ github.token }}
310
- cache-key : osx-x64 -vcpkg
325
+ cache-key : osx-${{ matrix.config.arch }} -vcpkg
311
326
github-binarycache : true
312
327
- name : pip3
313
328
run : |
@@ -318,8 +333,8 @@ jobs:
318
333
- name : colcon build
319
334
working-directory : ws
320
335
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
323
338
324
339
colcon build --merge-install \
325
340
--packages-ignore tesseract_examples trajopt_ifopt trajopt_sqp ifopt vhacd \
0 commit comments