Move to windows-2025

This commit is contained in:
Christoph Reiter 2024-12-20 11:23:33 +01:00
parent 657fd89531
commit 1575848e81
2 changed files with 3 additions and 3 deletions

View File

@ -9,7 +9,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
os: [ubuntu-24.04, windows-2022] os: [ubuntu-24.04, windows-2025]
python-version: ['3.10', '3.11', '3.12', '3.13'] python-version: ['3.10', '3.11', '3.12', '3.13']
steps: steps:

View File

@ -13,7 +13,7 @@ from .utils import apply_optional_deps
def generate_jobs_for(build_type: BuildType, optional_deps: str, count: int) -> Iterator[Dict[str, Any]]: def generate_jobs_for(build_type: BuildType, optional_deps: str, count: int) -> Iterator[Dict[str, Any]]:
name = build_type name = build_type
packages = " ".join(["base-devel"]) packages = " ".join(["base-devel"])
runner = ["windows-2022"] if build_type != "clangarm64" else ["Windows", "ARM64", "autobuild"] runner = ["windows-2025"] if build_type != "clangarm64" else ["Windows", "ARM64", "autobuild"]
build_from = itertools.cycle(["start", "end", "middle"]) build_from = itertools.cycle(["start", "end", "middle"])
for i in range(count): for i in range(count):
real_name = name if i == 0 else name + "-" + str(i + 1) real_name = name if i == 0 else name + "-" + str(i + 1)
@ -31,7 +31,7 @@ def generate_jobs_for(build_type: BuildType, optional_deps: str, count: int) ->
def generate_src_jobs(optional_deps: str, count: int) -> Iterator[Dict[str, Any]]: def generate_src_jobs(optional_deps: str, count: int) -> Iterator[Dict[str, Any]]:
name = "src" name = "src"
packages = " ".join(["base-devel", "VCS"]) packages = " ".join(["base-devel", "VCS"])
runner = ["windows-2022"] runner = ["windows-2025"]
build_types = [Config.MINGW_SRC_BUILD_TYPE, Config.MSYS_SRC_BUILD_TYPE] build_types = [Config.MINGW_SRC_BUILD_TYPE, Config.MSYS_SRC_BUILD_TYPE]
build_from = itertools.cycle(["start", "end", "middle"]) build_from = itertools.cycle(["start", "end", "middle"])
for i in range(count): for i in range(count):