Skip to content

Commit 8f96a54

Browse files
authored
Enable builds on macos-14 (M1) (#119)
* test macos-14 * update cache key for macos builds * update macos build instructions
1 parent b19d27a commit 8f96a54

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

.github/workflows/test.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -376,10 +376,16 @@ jobs:
376376
ctest --output-on-failure
377377
cd ..
378378
379-
build-macos-12:
380-
runs-on: macos-12
379+
build-macos:
380+
name: build-${{ matrix.os }}
381+
runs-on: ${{ matrix.os }}
382+
381383
if: "!contains(github.event.head_commit.message, '[skip ci]')"
382384

385+
strategy:
386+
matrix:
387+
os: [macos-12, macos-14]
388+
383389
steps:
384390
- uses: actions/checkout@v3
385391
with:
@@ -394,7 +400,7 @@ jobs:
394400
id: cache-opencv
395401
with:
396402
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')}}
398404

399405
- name: Install OpenCV
400406
if: steps.cache-opencv.outputs.cache-hit != 'true'
@@ -413,7 +419,7 @@ jobs:
413419
id: cache-exiv2
414420
with:
415421
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}}
417423

418424
- name: Install exiv2
419425
if: steps.cache-exiv2.outputs.cache-hit != 'true'

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,9 @@ Install with macports: `sudo port install libsdl2 spdlog catch2` (for details: [
7070
Run the build script from the root of the repository:
7171

7272
```
73-
./misc/build/build-macos-12.sh
73+
./misc/build/build-macos.sh
7474
```
7575

76-
See https://github.com/krupkat/xpano/pull/99 for build instructions on the Apple silicon.
77-
7876
### Ubuntu 22.04
7977

8078
Library prerequisites:
File renamed without changes.

0 commit comments

Comments
 (0)