Skip to content

Commit 16b5bb0

Browse files
authored
Set -mios-simulator-version-min=12.0 for skia build (#60)
* Set -mios-simulator-version-min=12.0 for skia build * Update macOS runners version * Remove old Xcode version selection (it's not available in a new runner)
1 parent 472febe commit 16b5bb0

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

Diff for: .github/workflows/build.yml

+2-5
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ permissions:
1616
contents: write
1717

1818
env:
19-
version: m126-6fd3120c1b
19+
version: m126-6fd3120c1b-1
2020

2121
jobs:
2222
macos:
23-
runs-on: ${{ fromJson('{"macos":"macos-13","ios":"macos-12","iosSim":"macos-12","tvos":"macos-13","tvosSim":"macos-13"}')[matrix.target] }}
23+
runs-on: ${{ fromJson('{"macos":"macos-13","ios":"macos-13","iosSim":"macos-13","tvos":"macos-13","tvosSim":"macos-13"}')[matrix.target] }}
2424
strategy:
2525
matrix:
2626
target: ["macos", "ios", "iosSim", "tvos", "tvosSim"]
@@ -36,9 +36,6 @@ jobs:
3636
if: ${{ github.event.inputs.skip_release != 'true' && github.ref == 'refs/heads/main' }}
3737
env:
3838
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
39-
- name: Select Xcode 13.1 for iOS targets
40-
if: ${{ matrix.target == 'ios' || matrix.target == 'iosSim' }}
41-
run: sudo xcode-select -s /Applications/Xcode_13.1.app
4239
- name: Print Xcode version
4340
run: xcodebuild -version
4441
- run: python3 script/checkout.py --version ${{ env.version }}

Diff for: script/build.py

+1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ def main():
4949
args += ['target_os="ios"']
5050
if isIosSim:
5151
args += ['ios_use_simulator=true']
52+
args += ['extra_cflags=["-mios-simulator-version-min=12.0"]']
5253
else:
5354
args += ['ios_min_target="12.0"']
5455
else:

0 commit comments

Comments
 (0)