Merge pull request #1053 from lukaszstolarczuk/add-extra-win-CI

Add extra Windows CI job

Author: lukaszstolarczuk

.github/workflows/gha.yml

@@ -102,7 +102,12 @@ jobs:
       MSBUILD:  "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\MSBuild\\Current\\Bin"
     strategy:
       matrix:
-        CONFIG: [Debug, Release]
+        BUILD_TYPE:   [Debug, Release]
+        CXX_STANDARD: [14]
+        include:
+          - BUILD_TYPE:   RelWithDebInfo
+            CXX_STANDARD: 17
+
     steps:
       - name: Update PATH
         run: echo "${env:MSBUILD}" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
@@ -141,19 +146,20 @@ jobs:
         run: cmake . -Bbuild
                     -G "${env:GENERATOR}"
                     -A "${env:ARCH}"
-                    -DCMAKE_BUILD_TYPE="${{ matrix.CONFIG }}"
+                    -DCMAKE_BUILD_TYPE="${{ matrix.BUILD_TYPE }}"
                     -DCMAKE_TOOLCHAIN_FILE="${env:CMAKE_TOOLCHAIN_FILE}"
                     -DCMAKE_INSTALL_PREFIX="${env:CMAKE_INSTALL_PREFIX}"
                     -DTESTS_USE_FORCED_PMEM=ON
                     -DTESTS_TBB=ON
                     -DDEVELOPER_MODE=ON
+                    -DCXX_STANDARD="${{ matrix.CXX_STANDARD }}"
 
       - name: Build
-        run: msbuild build/ALL_BUILD.vcxproj /property:Configuration=${{ matrix.CONFIG }} /verbosity:minimal /m
+        run: msbuild build/ALL_BUILD.vcxproj /property:Configuration=${{ matrix.BUILD_TYPE }} /verbosity:minimal /m
 
       - name: Tests
         working-directory: build
-        run: ctest -C ${{ matrix.CONFIG }} --output-on-failure --timeout "${env:TEST_TIMEOUT}"
+        run: ctest -C ${{ matrix.BUILD_TYPE }} --output-on-failure --timeout "${env:TEST_TIMEOUT}"
 
       - name: Install
         working-directory: build

examples/CMakeLists.txt

@@ -161,8 +161,12 @@ if(CURSES_FOUND)
 	add_example(pman pman/pman.cpp)
 	target_include_directories(example-pman PUBLIC ${CURSES_INCLUDE_DIR})
 	target_link_libraries(example-pman ${CURSES_LIBRARIES})
-else()
-	message(WARNING "ncurses not found - pman won't be build")
+
+	add_example(panaconda panaconda/panaconda.cpp)
+	target_include_directories(example-panaconda PUBLIC ${CURSES_INCLUDE_DIR})
+	target_link_libraries(example-panaconda ${CURSES_LIBRARIES})
+elseif(NOT WIN32)
+	message(WARNING "ncurses not found - pman and panaconda examples won't be build")
 endif()
 
 if(SFML_FOUND)
@@ -190,14 +194,6 @@ else()
 	message(WARNING "SFML 2.4 or newer not found - pmpong won't be build")
 endif()
 
-if(CURSES_FOUND)
-	add_example(panaconda panaconda/panaconda.cpp)
-	target_include_directories(example-panaconda PUBLIC ${CURSES_INCLUDE_DIR})
-	target_link_libraries(example-panaconda ${CURSES_LIBRARIES})
-else()
-	message(WARNING "ncurses not found - panaconda won't be build")
-endif()
-
 add_example(map_cli map_cli/map_cli.cpp)
 
 add_example(array array/array.cpp)

tests/CMakeLists.txt

@@ -132,8 +132,6 @@ if(BUILD_EXAMPLES AND NO_GCC_VARIADIC_TEMPLATE_BUG)
 	if(CURSES_FOUND AND NOT WIN32)
 		build_example_pman()
 		add_test_generic(NAME ex-pman CASE 0 TRACERS none SCRIPT ex-pman/ex-pman_0.cmake)
-	elseif(NOT WIN32)
-		message(WARNING "ncurses not found - pman test won't be build")
 	endif()
 elseif(BUILD_EXAMPLES)
 	message(WARNING "Skipping examples tests because of gcc variadic template bug")