From 82a15c6f9ce1b971af368704bf9736a788368c66 Mon Sep 17 00:00:00 2001 From: Gareth Sylvester-Bradley <31761158+garethsb@users.noreply.github.com> Date: Wed, 24 Jun 2026 10:50:37 +0100 Subject: [PATCH 1/3] Try out MSVC Build Tools 14.51 Signed-off-by: Gareth Sylvester-Bradley --- .github/workflows/conan-canary.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/conan-canary.yml b/.github/workflows/conan-canary.yml index 420b427..053a2b5 100644 --- a/.github/workflows/conan-canary.yml +++ b/.github/workflows/conan-canary.yml @@ -39,7 +39,7 @@ jobs: $profile = conan profile path default (Get-Content $profile) ` -replace '^compiler\.cppstd=.*$', 'compiler.cppstd=17' ` - -replace '^compiler\.version=.*$', 'compiler.version=194' | + -replace '^compiler\.version=.*$', 'compiler.version=195' | Set-Content $profile - name: Install dependencies without lockfile id: conan_install @@ -117,7 +117,7 @@ jobs: $profile = conan profile path default (Get-Content $profile) ` -replace '^compiler\.cppstd=.*$', 'compiler.cppstd=17' ` - -replace '^compiler\.version=.*$', 'compiler.version=194' | + -replace '^compiler\.version=.*$', 'compiler.version=195' | Set-Content $profile - name: Install dependencies without lockfile id: conan_install From e5582593caae25ed972cbb344411e40ef45d0d97 Mon Sep 17 00:00:00 2001 From: Gareth Sylvester-Bradley Date: Wed, 24 Jun 2026 12:15:03 +0100 Subject: [PATCH 2/3] ci: override Conan cmake tool_requires in canary for VS 2026. conan-canary Windows jobs use MSVC 195 and build nmos-cpp from source; Conan Center cmake/<4 cannot generate for Visual Studio 18 2026. Override tool_requires to cmake/[>=4.2.0 <5] in conan-canary only. See conan-io/conan-center-index#28884. Signed-off-by: Gareth Sylvester-Bradley --- .github/workflows/conan-canary.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.github/workflows/conan-canary.yml b/.github/workflows/conan-canary.yml index 053a2b5..eb6093b 100644 --- a/.github/workflows/conan-canary.yml +++ b/.github/workflows/conan-canary.yml @@ -36,11 +36,19 @@ jobs: if: runner.os == 'Windows' shell: pwsh run: | + # VS 2026 (MSVC 195) needs cmake >= 4.2 for the "Visual Studio 18 2026" + # generator when nmos-cpp and dependencies build from source. + # See conan-io/conan-center-index#28884. $profile = conan profile path default (Get-Content $profile) ` -replace '^compiler\.cppstd=.*$', 'compiler.cppstd=17' ` -replace '^compiler\.version=.*$', 'compiler.version=195' | Set-Content $profile + Add-Content -Path $profile -Value @( + '', + '[replace_tool_requires]', + 'cmake/*: cmake/[>=4.2.0 <5]' + ) - name: Install dependencies without lockfile id: conan_install run: | @@ -114,11 +122,19 @@ jobs: if: runner.os == 'Windows' shell: pwsh run: | + # VS 2026 (MSVC 195) needs cmake >= 4.2 for the "Visual Studio 18 2026" + # generator when nmos-cpp and dependencies build from source. + # See conan-io/conan-center-index#28884. $profile = conan profile path default (Get-Content $profile) ` -replace '^compiler\.cppstd=.*$', 'compiler.cppstd=17' ` -replace '^compiler\.version=.*$', 'compiler.version=195' | Set-Content $profile + Add-Content -Path $profile -Value @( + '', + '[replace_tool_requires]', + 'cmake/*: cmake/[>=4.2.0 <5]' + ) - name: Install dependencies without lockfile id: conan_install run: | From a9c4875ab17813fcce0b193b8d9245b552f02843 Mon Sep 17 00:00:00 2001 From: Gareth Sylvester-Bradley Date: Wed, 24 Jun 2026 18:49:14 +0100 Subject: [PATCH 3/3] ci: revert package-based canary Windows profile to main. Only build-nmos-cpp-from-source keeps MSVC 195 and the cmake 4.2 override. Signed-off-by: Gareth Sylvester-Bradley --- .github/workflows/conan-canary.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/conan-canary.yml b/.github/workflows/conan-canary.yml index eb6093b..2fe28d1 100644 --- a/.github/workflows/conan-canary.yml +++ b/.github/workflows/conan-canary.yml @@ -36,19 +36,11 @@ jobs: if: runner.os == 'Windows' shell: pwsh run: | - # VS 2026 (MSVC 195) needs cmake >= 4.2 for the "Visual Studio 18 2026" - # generator when nmos-cpp and dependencies build from source. - # See conan-io/conan-center-index#28884. $profile = conan profile path default (Get-Content $profile) ` -replace '^compiler\.cppstd=.*$', 'compiler.cppstd=17' ` - -replace '^compiler\.version=.*$', 'compiler.version=195' | + -replace '^compiler\.version=.*$', 'compiler.version=194' | Set-Content $profile - Add-Content -Path $profile -Value @( - '', - '[replace_tool_requires]', - 'cmake/*: cmake/[>=4.2.0 <5]' - ) - name: Install dependencies without lockfile id: conan_install run: |