File tree Expand file tree Collapse file tree 3 files changed +11
-7
lines changed Expand file tree Collapse file tree 3 files changed +11
-7
lines changed Original file line number Diff line number Diff line change @@ -376,10 +376,16 @@ jobs:
376
376
ctest --output-on-failure
377
377
cd ..
378
378
379
- build-macos-12 :
380
- runs-on : macos-12
379
+ build-macos :
380
+ name : build-${{ matrix.os }}
381
+ runs-on : ${{ matrix.os }}
382
+
381
383
if : " !contains(github.event.head_commit.message, '[skip ci]')"
382
384
385
+ strategy :
386
+ matrix :
387
+ os : [macos-12, macos-14]
388
+
383
389
steps :
384
390
- uses : actions/checkout@v3
385
391
with :
@@ -394,7 +400,7 @@ jobs:
394
400
id : cache-opencv
395
401
with :
396
402
path : opencv/install
397
- key : ${{runner .os}}-opencv-${{env.OPENCV_VERSION}}-${{hashFiles('misc/build/opencv-minimal-flags.txt')}}
403
+ key : ${{ matrix .os }}-opencv-${{env.OPENCV_VERSION}}-${{hashFiles('misc/build/opencv-minimal-flags.txt')}}
398
404
399
405
- name : Install OpenCV
400
406
if : steps.cache-opencv.outputs.cache-hit != 'true'
@@ -413,7 +419,7 @@ jobs:
413
419
id : cache-exiv2
414
420
with :
415
421
path : exiv2/install
416
- key : ${{runner .os}}-exiv2-${{env.EXIV2_VERSION}}-${{env.BUILD_TYPE}}
422
+ key : ${{ matrix .os }}-exiv2-${{env.EXIV2_VERSION}}-${{env.BUILD_TYPE}}
417
423
418
424
- name : Install exiv2
419
425
if : steps.cache-exiv2.outputs.cache-hit != 'true'
Original file line number Diff line number Diff line change @@ -70,11 +70,9 @@ Install with macports: `sudo port install libsdl2 spdlog catch2` (for details: [
70
70
Run the build script from the root of the repository:
71
71
72
72
```
73
- ./misc/build/build-macos-12 .sh
73
+ ./misc/build/build-macos.sh
74
74
```
75
75
76
- See https://github.com/krupkat/xpano/pull/99 for build instructions on the Apple silicon.
77
-
78
76
### Ubuntu 22.04
79
77
80
78
Library prerequisites:
File renamed without changes.
You can’t perform that action at this time.
0 commit comments