Skip to content

Commit

Permalink
Set -mios-simulator-version-min=12.0 for skia build (#60)
Browse files Browse the repository at this point in the history
* 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)
  • Loading branch information
eymar authored Jan 7, 2025
1 parent 472febe commit 16b5bb0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
7 changes: 2 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ permissions:
contents: write

env:
version: m126-6fd3120c1b
version: m126-6fd3120c1b-1

jobs:
macos:
runs-on: ${{ fromJson('{"macos":"macos-13","ios":"macos-12","iosSim":"macos-12","tvos":"macos-13","tvosSim":"macos-13"}')[matrix.target] }}
runs-on: ${{ fromJson('{"macos":"macos-13","ios":"macos-13","iosSim":"macos-13","tvos":"macos-13","tvosSim":"macos-13"}')[matrix.target] }}
strategy:
matrix:
target: ["macos", "ios", "iosSim", "tvos", "tvosSim"]
Expand All @@ -36,9 +36,6 @@ jobs:
if: ${{ github.event.inputs.skip_release != 'true' && github.ref == 'refs/heads/main' }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Select Xcode 13.1 for iOS targets
if: ${{ matrix.target == 'ios' || matrix.target == 'iosSim' }}
run: sudo xcode-select -s /Applications/Xcode_13.1.app
- name: Print Xcode version
run: xcodebuild -version
- run: python3 script/checkout.py --version ${{ env.version }}
Expand Down
1 change: 1 addition & 0 deletions script/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ def main():
args += ['target_os="ios"']
if isIosSim:
args += ['ios_use_simulator=true']
args += ['extra_cflags=["-mios-simulator-version-min=12.0"]']
else:
args += ['ios_min_target="12.0"']
else:
Expand Down

0 comments on commit 16b5bb0

Please sign in to comment.