Merge pull request opencv#41 from dmatveev/dm/fix-win-ci

CI: Remove Ninja as it is not listed in Windows image
alexgiving · Oct 10, 2023 · 0cad24f · 0cad24f
2 parents 639d3cd + d295d8f
commit 0cad24f
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml
@@ -27,9 +27,9 @@ jobs:
           mkdir build && cd build
 
           if [ "$RUNNER_OS" == "Windows" ]; then
-            cmake -DENABLE_ADE_TESTING=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=${{ matrix.version }} -G Ninja ..
-            cmake --build . --target GTest
-            cmake --build .
+            cmake -DENABLE_ADE_TESTING=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=${{ matrix.version }} ..
+            cmake --build . --target GTest --config Release
+            cmake --build . --config Release
 
           elif [ "$RUNNER_OS" == "Linux" ]; then
             cmake -DENABLE_ADE_TESTING=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=${{ matrix.version }} ..
@@ -40,10 +40,6 @@ jobs:
             exit 1
           fi
 
-      - name: ADE-Test Stage
-        shell: bash
-        run: ./build/bin/ade-tests 
-
-      - name: CMN-Test Stage
+      - name: Test Stage
         shell: bash
-        run: ./build/bin/common-tests
+        run: ctest -C Release