Skip to content

Commit 2adf7a1

Browse files
committed
CI: Bump MacOS runner to macos-15 + Xcode 26
1 parent 570f041 commit 2adf7a1

File tree

4 files changed

+13
-10
lines changed

4 files changed

+13
-10
lines changed

.github/workflows/linux-appimage-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
uses: actions/cache@v4
2323
with:
2424
path: ~/deps
25-
key: deps ${{ hashFiles('scripts/deps/build-dependencies-linux.sh', 'scripts/deps/build-ffmpeg-linux.sh') }}
25+
key: deps ${{ hashFiles('scripts/deps/build-dependencies-linux.sh', 'scripts/deps/build-ffmpeg-linux.sh', 'scripts/deps/versions') }}
2626

2727
- name: Build Dependencies
2828
if: steps.cache-deps.outputs.cache-hit != 'true'
@@ -90,7 +90,7 @@ jobs:
9090
uses: actions/cache@v4
9191
with:
9292
path: ~/deps
93-
key: deps ${{ hashFiles('scripts/deps/build-dependencies-linux.sh', 'scripts/deps/build-ffmpeg-linux.sh') }}
93+
key: deps ${{ hashFiles('scripts/deps/build-dependencies-linux.sh', 'scripts/deps/build-ffmpeg-linux.sh', 'scripts/deps/versions') }}
9494

9595
- name: Build Dependencies
9696
if: steps.cache-deps.outputs.cache-hit != 'true'

.github/workflows/linux-cross-appimage-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
uses: actions/cache@v4
2828
with:
2929
path: ~/deps
30-
key: deps-cross ${{ matrix.arch }} ${{ hashFiles('scripts/deps/build-dependencies-linux.sh', 'scripts/deps/build-dependencies-linux-cross.sh') }}
30+
key: deps-cross ${{ matrix.arch }} ${{ hashFiles('scripts/deps/build-dependencies-linux.sh', 'scripts/deps/build-dependencies-linux-cross.sh', 'scripts/deps/versions') }}
3131

3232
- name: Build Dependencies
3333
if: steps.cache-deps.outputs.cache-hit != 'true'

.github/workflows/macos-build.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,25 @@ on:
77
jobs:
88
macos-build:
99
name: "Universal"
10-
runs-on: macos-14
10+
runs-on: macos-15
1111
timeout-minutes: 120
1212
steps:
1313
- uses: actions/checkout@v5
1414
with:
1515
fetch-depth: 0
1616

17-
- name: Use Xcode 16.1
18-
run: sudo xcode-select -s /Applications/Xcode_16.1.app
17+
- name: Use Xcode 26
18+
run: sudo xcode-select -s /Applications/Xcode_26.0.app
19+
20+
- name: Download Metal Toolchain
21+
run: xcodebuild -downloadComponent MetalToolchain
1922

2023
- name: Cache Dependencies
2124
id: cache-deps-mac
2225
uses: actions/cache@v4
2326
with:
2427
path: ~/deps
25-
key: deps-mac ${{ hashFiles('scripts/deps/build-dependencies-mac.sh') }}
28+
key: deps-mac ${{ hashFiles('scripts/deps/build-dependencies-mac.sh', 'scripts/deps/versions') }}
2629

2730
- name: Build Dependencies
2831
if: steps.cache-deps-mac.outputs.cache-hit != 'true'

.github/workflows/windows-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
path: |
2222
dep/msvc/deps-arm64
2323
dep/msvc/deps-x64
24-
key: deps ${{ hashFiles('scripts/deps/build-dependencies-windows-arm64.bat', 'scripts/deps/build-dependencies-windows-x64.bat') }}
24+
key: deps ${{ hashFiles('scripts/deps/build-dependencies-windows-arm64.bat', 'scripts/deps/build-dependencies-windows-x64.bat', 'scripts/deps/versions') }}
2525

2626
- name: Build x64 Dependencies
2727
if: steps.cache-deps.outputs.cache-hit != 'true'
@@ -115,7 +115,7 @@ jobs:
115115
path: |
116116
dep/msvc/deps-arm64
117117
dep/msvc/deps-x64
118-
key: deps ${{ hashFiles('scripts/deps/build-dependencies-windows-arm64.bat', 'scripts/deps/build-dependencies-windows-x64.bat') }}
118+
key: deps ${{ hashFiles('scripts/deps/build-dependencies-windows-arm64.bat', 'scripts/deps/build-dependencies-windows-x64.bat', 'scripts/deps/versions') }}
119119

120120
- name: Build x64 Dependencies
121121
if: steps.cache-deps.outputs.cache-hit != 'true'
@@ -210,7 +210,7 @@ jobs:
210210
path: |
211211
dep/msvc/deps-arm64
212212
dep/msvc/deps-x64
213-
key: deps ${{ hashFiles('scripts/deps/build-dependencies-windows-arm64.bat', 'scripts/deps/build-dependencies-windows-x64.bat') }}
213+
key: deps ${{ hashFiles('scripts/deps/build-dependencies-windows-arm64.bat', 'scripts/deps/build-dependencies-windows-x64.bat', 'scripts/deps/versions') }}
214214

215215
- name: Build x64 Dependencies
216216
if: steps.cache-deps.outputs.cache-hit != 'true'

0 commit comments

Comments
 (0)