CI cleanup

colmap · Jul 25, 2024 · b900d22 · b900d22
1 parent 4c502da
commit b900d22
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,26 +16,48 @@ jobs:
     strategy:
       matrix:
         config: [
+
           {
             os: ubuntu-22.04,
             cmakeBuildType: Release,
             asanEnabled: false,
+            cudaEnabled: false,
             checkCodeFormat: true,
-            cudaEnabled: true,
           },
           {
             os: ubuntu-22.04,
             cmakeBuildType: Release,
             asanEnabled: false,
-            checkCodeFormat: false,
             cudaEnabled: true,
+            checkCodeFormat: false,
           },
           {
             os: ubuntu-22.04,
             cmakeBuildType: Release,
             asanEnabled: true,
+            cudaEnabled: false,
+            checkCodeFormat: false,
+          },
+          {
+            os: ubuntu-22.04,
+            cmakeBuildType: ClangTidy,
+            asanEnabled: false,
+            cudaEnabled: false,
             checkCodeFormat: false,
+          },
+          {
+            os: ubuntu-20.04,
+            cmakeBuildType: Release,
+            asanEnabled: false,
+            cudaEnabled: false,
+            checkCodeFormat: false,
+          },
+          {
+            os: ubuntu-20.04,
+            cmakeBuildType: Release,
+            asanEnabled: false,
             cudaEnabled: true,
+            checkCodeFormat: false,
           },
         ]
 
@@ -162,10 +184,8 @@ jobs:
             -DASAN_ENABLED=${{ matrix.config.asanEnabled }}
           ninja -k 10000
       - name: Run tests
-        run: |
-          if [ "${{ matrix.config.cmakeBuildType }}" == "ClangTidy" ]; then
-            exit 0
-          fi
+        if: matrix.config.cmakeBuildType != "ClangTidy"
+        run: |          
           export DISPLAY=":99.0"
           export QT_QPA_PLATFORM="offscreen"
           Xvfb :99 &

diff --git a/cmake/FindDependencies.cmake b/cmake/FindDependencies.cmake
@@ -27,7 +27,7 @@ endif()
 message(STATUS "Configuring COLMAP... done")
 
 find_package(Eigen3 3.4 REQUIRED)
-find_package(Ceres 2.0 REQUIRED COMPONENTS SuiteSparse)
+find_package(Ceres REQUIRED COMPONENTS SuiteSparse)
 find_package(Boost REQUIRED)
 
 if(TESTS_ENABLED)

diff --git a/glomap/CMakeLists.txt b/glomap/CMakeLists.txt
@@ -83,8 +83,7 @@ target_include_directories(
         ..
         ${SuiteSparse_CHOLMOD_INCLUDE_DIR}
 )
-message("!!!!!!!!!${SuiteSparse_CHOLMOD_LIBRARY}")
-message("!!!!!!!!!${SuiteSparse_CHOLMOD_INCLUDE_DIR}")
+
 if(OPENMP_FOUND)
     target_link_libraries(glomap PUBLIC OpenMP::OpenMP_CXX)
 endif()