CI: add ubuntu 24, upgrade checkout action, limit make threads

opencv · Oct 15, 2024 · 2002372 · 2002372
1 parent 0e8a2cc
commit 2002372
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml
@@ -12,14 +12,14 @@ jobs:
       matrix:
         version: [11, 14, 17, 20, 23]
         os: [
-            ubuntu-20.04,
             ubuntu-22.04,
+            ubuntu-24.04,
             windows-2022,
           ]
 
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Build Stage
         shell: bash
@@ -33,7 +33,7 @@ jobs:
 
           elif [ "$RUNNER_OS" == "Linux" ]; then
             cmake -DENABLE_ADE_TESTING=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=${{ matrix.version }} ..
-            make -j
+            make -j2
 
           else
             echo "$RUNNER_OS not supported"

diff --git a/sources/tests/CMakeLists.txt b/sources/tests/CMakeLists.txt
@@ -25,7 +25,7 @@ else()
     set(GTEST_LIBRARIES_PATH ${GTEST_INSTALL_DIR}/lib/)
 
     set(GTEST_LIB_PREFIX ${CMAKE_FIND_LIBRARY_PREFIXES})
-    if( WIN32 AND ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
+    if( WIN32 AND (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "MSVC"))
       # Somehow in this case we get GTest compiled as gtest.lib and
       # prefix equals to "pub;"
       # Workarounds, workarounds...