Skip to content

Commit 764da99

Browse files
Akemikasper93
authored andcommitted
ci/mac: add test runner for oldest macOS target
only meant for testing the oldest macOS target we support, currently 10.15, to catch possible usages of features that are not supported and not properly guarded. since dependencies are not build for that taget it will lead to a partially broken build.
1 parent a9cccbc commit 764da99

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

.github/workflows/build.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -227,10 +227,6 @@ jobs:
227227
runs-on: ${{ matrix.os }}
228228
strategy:
229229
matrix:
230-
os:
231-
- "macos-13"
232-
- "macos-14"
233-
- "macos-15"
234230
include:
235231
- os: "macos-13"
236232
arch: "intel"
@@ -241,6 +237,10 @@ jobs:
241237
xcode: "Xcode_15.2"
242238
- os: "macos-15"
243239
arch: "arm"
240+
- os: "macos-15"
241+
arch: "test"
242+
swift: "-target arm64-apple-macosx10.15"
243+
target: "10.15"
244244
steps:
245245
- uses: actions/checkout@v4
246246

@@ -276,8 +276,11 @@ jobs:
276276
./ci/build-macos.sh
277277
env:
278278
TRAVIS_OS_NAME: "${{ matrix.os }}"
279+
SWIFT_FLAGS: "${{ matrix.swift }}"
280+
MACOSX_DEPLOYMENT_TARGET: "${{ matrix.target }}"
279281

280282
- name: Create App Bundle
283+
if: ${{ matrix.arch != 'test' }}
281284
run: |
282285
meson compile -C build macos-bundle
283286
tar -czvf mpv.tar.gz -C build mpv.app
@@ -298,6 +301,7 @@ jobs:
298301
cat ./build/meson-logs/testlog.txt
299302
300303
- uses: actions/upload-artifact@v4
304+
if: ${{ matrix.arch != 'test' }}
301305
with:
302306
name: mpv-${{ matrix.os }}-${{ matrix.arch }}
303307
path: mpv.tar.gz

ci/build-macos.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ meson setup build $common_args \
1818
-Dobjc_args="-Wno-error=deprecated -Wno-error=deprecated-declarations" \
1919
-D{gl,iconv,lcms2,lua,jpeg,plain-gl,zlib}=enabled \
2020
-D{cocoa,coreaudio,gl-cocoa,videotoolbox-gl,videotoolbox-pl}=enabled \
21-
-D{swift-build,macos-cocoa-cb,macos-media-player,macos-touchbar,vulkan}=enabled
21+
-D{swift-build,macos-cocoa-cb,macos-media-player,macos-touchbar,vulkan}=enabled \
22+
-Dswift-flags="${SWIFT_FLAGS}"
2223

2324
meson compile -C build -j4
2425
meson install -C build

0 commit comments

Comments
 (0)