Refine CI setup pt 5

lczech · Jul 2, 2024 · 2fa2ab3 · 2fa2ab3
1 parent 19063c5
commit 2fa2ab3
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -550,7 +550,7 @@ jobs:
             sudo xcode-select --switch /Library/Developer/CommandLineTools
           fi
 
-          cmake --build ./build -- -j 2
+          cmake --build ./build -- -j 4
 
       # -------------------------------------------------------
       #     Test

diff --git a/test/src/utils/core/info.cpp b/test/src/utils/core/info.cpp
@@ -107,7 +107,7 @@ TEST( Info, Usage )
 
     // Test totals
     EXPECT_GT( info_process_peak_memory_usage(), 0 );
-    EXPECT_GT( info_process_total_cpu_time(), 0 );
+    EXPECT_GT( info_process_total_cpu_time().first, 0.0 );
 
     // Same as above
     auto info_total = info_process_print_total_usage();

diff --git a/tools/cmake/GTestDownload.cmake b/tools/cmake/GTestDownload.cmake
@@ -1,5 +1,5 @@
 # Genesis - A toolkit for working with phylogenetic data.
-# Copyright (C) 2014-2022 Lucas Czech
+# Copyright (C) 2014-2024 Lucas Czech
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -30,7 +30,7 @@
 #   GTest Download
 # ------------------------------------------------------------------------------
 
-cmake_minimum_required( VERSION 3.1 )
+cmake_minimum_required( VERSION 3.5 )
 project( googletest-download NONE )
 
 include(ExternalProject)

diff --git a/tools/cmake/IncludeHtslib.cmake b/tools/cmake/IncludeHtslib.cmake
@@ -25,7 +25,7 @@
 
 # This file is included from the main CMakeLists.txt in order to build htslib.
 message (STATUS "Looking for htslib")
-cmake_minimum_required( VERSION 3.1 )
+cmake_minimum_required( VERSION 3.5 )
 if(NOT DEFINED HTSLIB_DIR)
   include(ExternalProject)
 endif()