Fix ci windows

gabime · Nov 29, 2024 · 5c4f5f4 · 5c4f5f4
1 parent 9dab02a
commit 5c4f5f4
Showing 1 changed file with 61 additions and 61 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -69,66 +69,66 @@ jobs:
       - name: Run Tests
         shell: pwsh
         env:
-          PATH: ${{ env.PATH }};${{ github.workspace }}\build\_deps\catch2-build\src\${{ matrix.config.BUILD_TYPE }};${{ github.workspace }}\build\${{ matrix.config.BUILD_TYPE }}
-        run: ${{ github.workspace }}\build\${{ matrix.config.BUILD_TYPE }}\spdlog-tests.exe
+          PATH: ${{ env.PATH }};${{ github.workspace }}\build\_deps\catch2-build\src\${{ matrix.config.BUILD_TYPE }};${{ github.workspace }}\build\bin\${{ matrix.config.BUILD_TYPE }}
+        run: ${{ github.workspace }}\build\${{ matrix.config.BUILD_TYPE }}\spdlog-utests.exe
 
 
-  # -----------------------------------------------------------------------
-  # MSVC 2019 build matrix
-  # -----------------------------------------------------------------------
-  build_2019:
-    runs-on: windows-2019
-    strategy:
-      fail-fast: true
-      matrix:
-        config:
-          - GENERATOR: "Visual Studio 16 2019"
-            BUILD_TYPE: Release
-            BUILD_SHARED: 'ON'
-            FATAL_ERRORS: 'ON'
-            WCHAR: 'OFF'
-            WCHAR_FILES: 'OFF'
-            BUILD_EXAMPLE: 'ON'
-            USE_STD_FORMAT: 'OFF'
-            CXX_STANDARD: 17
-          - GENERATOR: "Visual Studio 16 2019"
-            BUILD_TYPE: Release
-            BUILD_SHARED: 'ON'
-            FATAL_ERRORS: 'ON'
-            WCHAR: 'OFF'
-            WCHAR_FILES: 'OFF'
-            BUILD_EXAMPLE: 'ON'
-            USE_STD_FORMAT: 'OFF'
-            CXX_STANDARD: 20
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: CMake ${{ matrix.config.GENERATOR }} CXX=${{matrix.config.CXX_STANDARD}} WCHAR=${{matrix.config.WCHAR_FILES}} STD_FORMAT=${{matrix.config.USE_STD_FORMAT}}
-        shell: pwsh
-        run: |
-          mkdir build
-          cd build
-          cmake -G "${{ matrix.config.GENERATOR }}"  -A x64 `
-            -D CMAKE_BUILD_TYPE=${{ matrix.config.BUILD_TYPE }} `
-            -D BUILD_SHARED_LIBS=${{ matrix.config.BUILD_SHARED }} `
-            -D SPDLOG_WCHAR_SUPPORT=${{ matrix.config.WCHAR }} `
-            -D SPDLOG_WCHAR_FILENAMES=${{ matrix.config.WCHAR_FILES }} `
-            -D SPDLOG_BUILD_EXAMPLE=${{ matrix.config.BUILD_EXAMPLE }} `
-            -D SPDLOG_BUILD_TESTS=ON `
-            -D SPDLOG_BUILD_WARNINGS=${{ matrix.config.FATAL_ERRORS }} `
-            -D SPDLOG_USE_STD_FORMAT=${{ matrix.config.USE_STD_FORMAT }} `
-            -D CMAKE_CXX_STANDARD=${{ matrix.config.CXX_STANDARD }} ..
-
-      - name: Build
-        shell: pwsh
-        run: |
-          cd build
-          cmake --build  . --parallel --config ${{ matrix.config.BUILD_TYPE }}
-
-      - name: Run Tests
-        shell: pwsh
-        env:
-          PATH: ${{ env.PATH }};${{ github.workspace }}\build\_deps\catch2-build\src\${{ matrix.config.BUILD_TYPE }};${{ github.workspace }}\build\${{ matrix.config.BUILD_TYPE }}
-        run: ${{ github.workspace }}\build\${{ matrix.config.BUILD_TYPE }}\spdlog-tests.exe
+#  # -----------------------------------------------------------------------
+#  # MSVC 2019 build matrix
+#  # -----------------------------------------------------------------------
+#  build_2019:
+#    runs-on: windows-2019
+#    strategy:
+#      fail-fast: true
+#      matrix:
+#        config:
+#          - GENERATOR: "Visual Studio 16 2019"
+#            BUILD_TYPE: Release
+#            BUILD_SHARED: 'ON'
+#            FATAL_ERRORS: 'ON'
+#            WCHAR: 'OFF'
+#            WCHAR_FILES: 'OFF'
+#            BUILD_EXAMPLE: 'ON'
+#            USE_STD_FORMAT: 'OFF'
+#            CXX_STANDARD: 17
+#          - GENERATOR: "Visual Studio 16 2019"
+#            BUILD_TYPE: Release
+#            BUILD_SHARED: 'ON'
+#            FATAL_ERRORS: 'ON'
+#            WCHAR: 'OFF'
+#            WCHAR_FILES: 'OFF'
+#            BUILD_EXAMPLE: 'ON'
+#            USE_STD_FORMAT: 'OFF'
+#            CXX_STANDARD: 20
+#
+#    steps:
+#      - name: Checkout code
+#        uses: actions/checkout@v4
+#
+#      - name: CMake ${{ matrix.config.GENERATOR }} CXX=${{matrix.config.CXX_STANDARD}} WCHAR=${{matrix.config.WCHAR_FILES}} STD_FORMAT=${{matrix.config.USE_STD_FORMAT}}
+#        shell: pwsh
+#        run: |
+#          mkdir build
+#          cd build
+#          cmake -G "${{ matrix.config.GENERATOR }}"  -A x64 `
+#            -D CMAKE_BUILD_TYPE=${{ matrix.config.BUILD_TYPE }} `
+#            -D BUILD_SHARED_LIBS=${{ matrix.config.BUILD_SHARED }} `
+#            -D SPDLOG_WCHAR_SUPPORT=${{ matrix.config.WCHAR }} `
+#            -D SPDLOG_WCHAR_FILENAMES=${{ matrix.config.WCHAR_FILES }} `
+#            -D SPDLOG_BUILD_EXAMPLE=${{ matrix.config.BUILD_EXAMPLE }} `
+#            -D SPDLOG_BUILD_TESTS=ON `
+#            -D SPDLOG_BUILD_WARNINGS=${{ matrix.config.FATAL_ERRORS }} `
+#            -D SPDLOG_USE_STD_FORMAT=${{ matrix.config.USE_STD_FORMAT }} `
+#            -D CMAKE_CXX_STANDARD=${{ matrix.config.CXX_STANDARD }} ..
+#
+#      - name: Build
+#        shell: pwsh
+#        run: |
+#          cd build
+#          cmake --build  . --parallel --config ${{ matrix.config.BUILD_TYPE }}
+#
+#      - name: Run Tests
+#        shell: pwsh
+#        env:
+#          PATH: ${{ env.PATH }};${{ github.workspace }}\build\_deps\catch2-build\src\${{ matrix.config.BUILD_TYPE }};${{ github.workspace }}\build\${{ matrix.config.BUILD_TYPE }}
+#        run: ${{ github.workspace }}\build\${{ matrix.config.BUILD_TYPE }}\spdlog-tests.exe