Skip to content

Commit a4373c6

Browse files
authored
Merge pull request #380 from smvv/fix-windows2025
Reapply "Upgrade to windows-2025-vs2026 explicitly"
2 parents 66aeca8 + b3af38e commit a4373c6

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

config/distribution_matrix.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"include": [
6262
{
6363
"duckdb_arch": "windows_amd64",
64-
"runner": "windows-latest",
64+
"runner": "windows-2025-vs2026",
6565
"vcpkg_target_triplet": "x64-windows-static-release",
6666
"vcpkg_host_triplet": "x64-windows-static-release",
6767
"run_in_reduced_ci_mode": true,
@@ -77,7 +77,7 @@
7777
},
7878
{
7979
"duckdb_arch": "windows_amd64_mingw",
80-
"runner": "windows-latest",
80+
"runner": "windows-2025-vs2026",
8181
"vcpkg_target_triplet": "x64-mingw-static",
8282
"vcpkg_host_triplet": "x64-mingw-static",
8383
"run_in_reduced_ci_mode": false,

scripts/extbuild/cmd/extbuild/matrix_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ func TestComputePlatformMatrices(t *testing.T) {
4343
"include": [
4444
{
4545
"duckdb_arch": "windows_amd64",
46-
"runner": "windows-latest",
46+
"runner": "windows-2025-vs2026",
4747
"run_in_reduced_ci_mode": true,
4848
"opt_in": false
4949
},
5050
{
5151
"duckdb_arch": "windows_amd64_mingw",
52-
"runner": "windows-latest",
52+
"runner": "windows-2025-vs2026",
5353
"run_in_reduced_ci_mode": true,
5454
"opt_in": false
5555
},
@@ -221,7 +221,7 @@ func TestMatrixSubcommandWritesOutputFile(t *testing.T) {
221221
},
222222
"windows": {
223223
"include": [
224-
{"duckdb_arch":"windows_amd64","runner":"windows-latest","run_in_reduced_ci_mode":true,"opt_in":false}
224+
{"duckdb_arch":"windows_amd64","runner":"windows-2025-vs2026","run_in_reduced_ci_mode":true,"opt_in":false}
225225
]
226226
}
227227
}`
@@ -290,7 +290,7 @@ func TestMatrixSubcommandPreservesRunnerWhenNotOverridden(t *testing.T) {
290290
inputJSON := `{
291291
"windows": {
292292
"include": [
293-
{"duckdb_arch":"windows_amd64","runner":"windows-latest","run_in_reduced_ci_mode":true,"opt_in":false}
293+
{"duckdb_arch":"windows_amd64","runner":"windows-2025-vs2026","run_in_reduced_ci_mode":true,"opt_in":false}
294294
]
295295
}
296296
}`
@@ -310,7 +310,7 @@ func TestMatrixSubcommandPreservesRunnerWhenNotOverridden(t *testing.T) {
310310
require.NoError(t, json.Unmarshal([]byte(strings.TrimPrefix(line, "windows_matrix=")), &matrix))
311311
require.Len(t, matrix.Include, 1)
312312
assert.Equal(t, "windows_amd64", matrix.Include[0].DuckDBArch)
313-
assert.Equal(t, "windows-latest", matrix.Include[0].Runner)
313+
assert.Equal(t, "windows-2025-vs2026", matrix.Include[0].Runner)
314314
}
315315

316316
func TestMatrixSubcommandWithoutArgs(t *testing.T) {
@@ -335,7 +335,7 @@ func TestMatrixSubcommandDeployMode(t *testing.T) {
335335
},
336336
"windows": {
337337
"include": [
338-
{"duckdb_arch":"windows_amd64","runner":"windows-latest","run_in_reduced_ci_mode":true,"opt_in":false}
338+
{"duckdb_arch":"windows_amd64","runner":"windows-2025-vs2026","run_in_reduced_ci_mode":true,"opt_in":false}
339339
]
340340
}
341341
}`

0 commit comments

Comments
 (0)