Skip to content

Commit 24eeb7d

Browse files
committed
Merge branch 'dev-monterey'
2 parents 6524c73 + 6ea54f4 commit 24eeb7d

File tree

194 files changed

+10075
-4755
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

194 files changed

+10075
-4755
lines changed

.github/workflows/build.yml

+4-5
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
branches:
55
- 'master'
66
- 'dev'
7+
- 'dev-monterey'
78
tags-ignore:
89
- '**'
910
paths-ignore:
@@ -32,16 +33,14 @@ jobs:
3233
platform: ios
3334
- arch: x86_64
3435
platform: ios-tci
35-
- arch: arm64
36-
platform: ios_simulator # FIXME: enable when ANGLE supports it
3736
steps:
3837
- name: Checkout
3938
uses: actions/checkout@v2
4039
with:
4140
submodules: recursive
4241
- name: Setup Xcode
4342
shell: bash
44-
run: sudo xcode-select -switch /Applications/Xcode_13.1.app
43+
run: sudo xcode-select -switch /Applications/Xcode_13.2.1.app
4544
- name: Cache Sysroot
4645
id: cache-sysroot
4746
uses: actions/cache@v2
@@ -57,7 +56,7 @@ jobs:
5756
if: steps.cache-sysroot.outputs.cache-hit != 'true'
5857
run: |
5958
brew uninstall cmake
60-
brew install bison pkg-config nasm make meson
59+
brew install bison pkg-config nasm make meson glib
6160
rm -f /usr/local/lib/pkgconfig/*.pc
6261
./scripts/build_dependencies.sh -p ${{ matrix.platform }} -a ${{ matrix.arch }}
6362
- name: Compress Sysroot
@@ -112,7 +111,7 @@ jobs:
112111
path: sysroot.tgz
113112
- name: Setup Xcode
114113
shell: bash
115-
run: sudo xcode-select -switch /Applications/Xcode_13.1.app
114+
run: sudo xcode-select -switch /Applications/Xcode_13.2.1.app
116115
- name: Build UTM
117116
run: |
118117
./scripts/build_utm.sh -t "$SIGNING_TEAM_ID" -p macos -a "arm64 x86_64" -o UTM

0 commit comments

Comments
 (0)