From: Frank Lichtenheld <[email protected]> Since Github will switch to windows-2025 image to use VS 2026 at some point in the near future (according to https://github.blog/changelog/2026-02-05-github-actions-early-february-2026-updates/#windows-server-2025-with-visual-studio-2026-image-now-available-for-github-hosted-runners) enforce that switch to avoid any build failures. Since we hardcode the VS version in CMakePresets.json (and I do not see an easy way to avoid this with CMake), we need to override the generator value. We can switch the default once our release infrastructure has been switched to VS 2026.
Change-Id: I8a17d452e9e5690a5507d17129286142df6c88f1 Signed-off-by: Frank Lichtenheld <[email protected]> Acked-by: Arne Schwabe <[email protected]> Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1711 --- This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master. Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1711 This mail reflects revision 1 of this Change. Acked-by according to Gerrit (reflected above): Arne Schwabe <[email protected]> diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 323645a..4cab0ac 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -138,7 +138,7 @@ test: [argv, auth_token, buffer, cryptoapi, crypto, misc, options_parse, ncp, openvpnserv, packet_id, pkt, provider, ssl, tls_crypt, user_pass] build: [Release, Debug] - runs-on: windows-2025 + runs-on: windows-2025-vs2026 name: "mingw unittest ${{ matrix.test }} - ${{ matrix.arch }} - ${{ matrix.build }} - OSSL" steps: - name: Checkout OpenVPN @@ -285,7 +285,7 @@ VCPKG_BINARY_SOURCES: clear;default,readwrite VCPKG_GIT_COMMIT_ID: 75672db6bd812b060482b0f00b5a16b18a0c0f07 - runs-on: windows-2025 + runs-on: windows-2025-vs2026 steps: - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 - uses: lukka/get-cmake@591817e96fcad43505fb4eae36172462abb3a42e # v4.3.3 @@ -315,6 +315,7 @@ with: configurePreset: win-${{ matrix.arch }}-release buildPreset: win-${{ matrix.arch }}-release + configurePresetAdditionalArgs: "['-GVisual Studio 18 2026']" - name: Run CMake with vcpkg.json manifest uses: lukka/run-cmake@5d55ea7949e25f69f0ecb516d8d572297e03a956 # v10.9 @@ -323,6 +324,7 @@ configurePreset: win-${{ matrix.arch }}-release buildPreset: win-${{ matrix.arch }}-release testPreset: win-${{ matrix.arch }}-release + configurePresetAdditionalArgs: "['-GVisual Studio 18 2026']" testPresetAdditionalArgs: "['--output-on-failure']" - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 _______________________________________________ Openvpn-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openvpn-devel
