From a0cdbd43bbb83350af0b998491a3c529cc897628 Mon Sep 17 00:00:00 2001 From: Anders Lindh Olsson Date: Thu, 7 May 2026 09:10:36 +0200 Subject: [PATCH 1/2] chore(client): bump ci-scripts submodule --- client/.ci | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/.ci b/client/.ci index 20f8e053..fbbfced9 160000 --- a/client/.ci +++ b/client/.ci @@ -1 +1 @@ -Subproject commit 20f8e053931fdef8a9413cc6229286c5d9ed152f +Subproject commit fbbfced900b5e87de9a176a68c40b8cafa3e8e01 From 9b7f6234a62f01ed67e225dd5096a6ba10b764a4 Mon Sep 17 00:00:00 2001 From: Anders Lindh Olsson Date: Thu, 7 May 2026 09:17:28 +0200 Subject: [PATCH 2/2] fix(ci): skip vs2022 on windows-2025 windows-2025 runners are transitioning to a VS2026 image, which breaks ci-scripts vcvars lookup for CMP=vs2022. Exclude that matrix leg to keep Windows CI green while retaining vs2022 coverage on windows-2022. Add a TODO with an upstream tracking link so this exclusion can be removed once ci-scripts issue #112 is resolved. --- .github/workflows/ci-scripts-build.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ci-scripts-build.yml b/.github/workflows/ci-scripts-build.yml index a216a5cd..85320341 100644 --- a/.github/workflows/ci-scripts-build.yml +++ b/.github/workflows/ci-scripts-build.yml @@ -95,6 +95,11 @@ jobs: os: [windows-2022, windows-2025] cmp: [gcc, vs2022] configuration: [default, static, debug, static-debug] + # TODO: Remove this exclusion once ci-scripts supports windows-2025-vs2026 with + # CMP=vs2022: https://github.com/epics-base/ci-scripts/issues/112 + exclude: + - os: windows-2025 + cmp: vs2022 steps: - uses: actions/checkout@v6 with: