Skip to content

Commit 8a036fa

Browse files
committed
Merge tag 'm132.6834.5.2' into support/hololens2
2 parents 8a37a70 + ba9e6e1 commit 8a036fa

25 files changed

+1037
-792
lines changed

.github/workflows/build.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ jobs:
7474
runs-on: macos-14
7575
steps:
7676
- uses: actions/checkout@v4
77-
- name: Select Xcode 14.3.1
78-
run: sudo xcode-select --switch /Applications/Xcode_14.3.1.app/Contents/Developer
77+
- name: Select Xcode 15.4
78+
run: sudo xcode-select --switch /Applications/Xcode_15.4.app/Contents/Developer
7979
- run: brew install ninja
8080
- name: Setup Git User
8181
run: |
@@ -107,20 +107,20 @@ jobs:
107107
runs-on: ubuntu-20.04
108108
- name: raspberry-pi-os_armv8
109109
runs-on: ubuntu-20.04
110-
- name: ubuntu-18.04_armv8
111-
runs-on: ubuntu-20.04
112110
- name: ubuntu-20.04_armv8
113111
runs-on: ubuntu-20.04
114112
- name: ubuntu-22.04_armv8
115-
runs-on: ubuntu-20.04
113+
runs-on: ubuntu-22.04
114+
- name: ubuntu-24.04_armv8
115+
runs-on: ubuntu-24.04
116116
- name: ubuntu-20.04_x86_64
117117
runs-on: ubuntu-20.04
118118
- name: ubuntu-22.04_x86_64
119119
runs-on: ubuntu-22.04
120120
- name: ubuntu-24.04_x86_64
121121
runs-on: ubuntu-24.04
122122
- name: android
123-
runs-on: ubuntu-20.04
123+
runs-on: ubuntu-22.04
124124
runs-on: ${{ matrix.platform.runs-on }}
125125
steps:
126126
- uses: actions/checkout@v4
@@ -208,15 +208,15 @@ jobs:
208208
- uses: ./.github/actions/download
209209
with:
210210
platform: raspberry-pi-os_armv8
211-
- uses: ./.github/actions/download
212-
with:
213-
platform: ubuntu-18.04_armv8
214211
- uses: ./.github/actions/download
215212
with:
216213
platform: ubuntu-20.04_armv8
217214
- uses: ./.github/actions/download
218215
with:
219216
platform: ubuntu-22.04_armv8
217+
- uses: ./.github/actions/download
218+
with:
219+
platform: ubuntu-24.04_armv8
220220
- uses: ./.github/actions/download
221221
with:
222222
platform: ubuntu-20.04_x86_64

0 commit comments

Comments
 (0)