Skip to content

Commit ef97d2e

Browse files
authored
Merge pull request #13543 from RytoEX/update-to-vs2026
CI: Update to VS 2026
2 parents 84b8d16 + c60ca29 commit ef97d2e

7 files changed

Lines changed: 10 additions & 10 deletions

File tree

.github/workflows/analyze-project.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
jobs:
55
windows:
66
name: Windows 🪟 (PVS-Studio)
7-
runs-on: windows-2022
7+
runs-on: windows-2025-vs2026
88
if: false && github.repository_owner == 'obsproject'
99
defaults:
1010
run:

.github/workflows/build-project.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ jobs:
379379
strategy:
380380
matrix:
381381
architecture: [x64, arm64]
382-
runs-on: windows-2022
382+
runs-on: windows-2025-vs2026
383383
needs: check-event
384384
defaults:
385385
run:

.github/workflows/dispatch.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ jobs:
139139
windows-patches:
140140
name: Create Windows Patches 🩹
141141
if: github.repository_owner == 'obsproject' && inputs.job == 'patches'
142-
runs-on: windows-2022
142+
runs-on: windows-2025-vs2026
143143
steps:
144144
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
145145
- uses: ./.github/actions/windows-patches

.github/workflows/publish.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ jobs:
246246
name: Create Windows Patches 🩹
247247
needs: check-tag
248248
if: github.repository_owner == 'obsproject' && fromJSON(needs.check-tag.outputs.validTag)
249-
runs-on: windows-2022
249+
runs-on: windows-2025-vs2026
250250
steps:
251251
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
252252
- uses: ./.github/actions/windows-patches

.github/workflows/push.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ jobs:
207207

208208
sign-windows-build:
209209
name: Windows Signing ✍️
210-
uses: obsproject/obs-studio/.github/workflows/sign-windows.yaml@037100a28131fc10127f5a3f85b80306ebe1b6ff
210+
uses: obsproject/obs-studio/.github/workflows/sign-windows.yaml@83bb52b68293770f0043353c969ffe9fddfe3189
211211
if: github.repository_owner == 'obsproject' && github.ref_type == 'tag'
212212
needs: build-project
213213
permissions:

.github/workflows/sign-windows.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
strategy:
88
matrix:
99
architecture: [x64, arm64]
10-
runs-on: windows-2022
10+
runs-on: windows-2025-vs2026
1111
environment:
1212
name: bouf
1313
defaults:

CMakePresets.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,9 @@
162162
"lhs": "${hostSystemName}",
163163
"rhs": "Windows"
164164
},
165-
"architecture": "x64,version=10.0.22621.0",
165+
"architecture": "x64,version=10.0.26100.0",
166166
"binaryDir": "${sourceDir}/build_x64",
167-
"generator": "Visual Studio 17 2022",
167+
"generator": "Visual Studio 18 2026",
168168
"cacheVariables": {
169169
"GPU_PRIORITY_VAL": {"type": "STRING", "value": "$penv{GPU_PRIORITY_VAL}"},
170170
"VIRTUALCAM_GUID": {"type": "STRING", "value": "A3FCE0F5-3493-419F-958A-ABA1250EC20B"},
@@ -191,9 +191,9 @@
191191
"lhs": "${hostSystemName}",
192192
"rhs": "Windows"
193193
},
194-
"architecture": "ARM64,version=10.0.22621.0",
194+
"architecture": "ARM64,version=10.0.26100.0",
195195
"binaryDir": "${sourceDir}/build_arm64",
196-
"generator": "Visual Studio 17 2022",
196+
"generator": "Visual Studio 18 2026",
197197
"cacheVariables": {
198198
"GPU_PRIORITY_VAL": {"type": "STRING", "value": "$penv{GPU_PRIORITY_VAL}"},
199199
"VIRTUALCAM_GUID": {"type": "STRING", "value": "A3FCE0F5-3493-419F-958A-ABA1250EC20B"},

0 commit comments

Comments
 (0)