Bump build system (#44)

.github/workflows/buildtest.yml

@@ -23,7 +23,7 @@ jobs:
  runs-on: ubuntu-latest
  strategy:
  matrix:
- distro: ["debian-11", "debian-12", "ubuntu-20.04", "ubuntu-22.04", "ubuntu-24.04", "minimal_dependencies"]
+ distro: ["debian-12", "ubuntu-22.04", "ubuntu-24.04"]
  buildType: ["Debug", "Release"]
  steps:
  - name: Git clone
@@ -41,6 +41,30 @@ jobs:
  - name: Run tests
  run: docker exec ci bash -c "cd /opt/carl/build; ctest test --output-on-failure"
 
+ minimalTests:
+ name: Minimal dependencies Tests ${{ matrix.buildType }})
+ runs-on: ubuntu-latest
+ strategy:
+ matrix:
+ distro: ["minimal_dependencies"]
+ buildType: ["Debug", "Release"]
+ steps:
+ - name: Git clone
+ uses: actions/checkout@v4
+ - name: Build Carl-storm from Dockerfile
+ run: |
+ docker build -t movesrwth/carl-storm:ci . \
+ --build-arg BASE_IMAGE=movesrwth/storm-basesystem:${{ matrix.distro }} \
+ --build-arg build_type="${{ matrix.buildType }}" \
+ --build-arg no_threads=${NR_JOBS}
+ - name: Run Docker
+ run: docker run -d -it --name ci movesrwth/carl-storm:ci
+ - name: Build tests
+ run: docker exec ci bash -c "cd /opt/carl/build; make -j ${NR_JOBS}"
+ - name: Run tests
+ run: docker exec ci bash -c "cd /opt/carl/build; ctest test --output-on-failure"
+
+
  deploy:
  name: Test and Deploy (${{ matrix.buildType.name }})
  runs-on: ubuntu-latest
@@ -87,7 +111,7 @@ jobs:
  notify:
  name: Email notification
  runs-on: ubuntu-latest
- needs: [distroTests, deploy]
+ needs: [distroTests, minimalTests, deploy]
  # Only run in main repo and even if previous step failed
  if: github.repository_owner == 'moves-rwth' && always()
  steps:

CMakeLists.txt

@@ -9,12 +9,14 @@
 # G. CPack
 # # # # # # # # # # # # # # # # # # # # # #
 
-cmake_minimum_required (VERSION 3.15)
+cmake_minimum_required (VERSION 3.22)
 
 if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.24")
  cmake_policy(SET CMP0135 NEW) # Use timestamps from time of extraction
 endif()
 
+set(CMAKE_CXX_STANDARD 20)
+
 # # # # # # # # # # # # # # # # # # # # # #
 # A. Project properties
 # # # # # # # # # # # # # # # # # # # # # #
@@ -52,7 +54,6 @@ option( FORCE_SHIPPED_GMP "Do not look in system for lib gmp" OFF )
 export_option(FORCE_SHIPPED_GMP)
 option( USE_GINAC "Compile with testing with the runtime and result comparisons of carl to ginac" ON )
 export_option(USE_GINAC)
-option( COMPARE_WITH_Z3 "Compile benchmarks that compare to z3" OFF )
 option( USE_Z3_NUMBERS "Make z3 rationals available in carl" OFF )
 option( USE_CLN_NUMBERS "Make cln rationals and integers available in carl" ON )
 export_option(USE_CLN_NUMBERS)

resources/resources.cmake

@@ -166,11 +166,6 @@ IF(USE_MPFR_FLOAT)
  load_library(carl MPFR 0.0 REQUIRED)
 endif()
 
-##### Z3
-if(COMPARE_WITH_Z3)
- load_library(carl Z3 4.0)
-endif()
-
 ##### Doxygen
 find_package(Doxygen 1.8.9 QUIET)
 if(DOXYGEN_FOUND AND ${CMAKE_VERSION} VERSION_LESS "3.9.0")

src/carl/converter/config.h.in

@@ -4,4 +4,3 @@
 #pragma once
 
 #cmakedefine USE_GINAC
-#cmakedefine COMPARE_WITH_Z3

src/tests/CMakeLists.txt

@@ -10,13 +10,9 @@ add_dependencies(TestCommon resources lib_carl GTESTCORE_STATIC GTESTMAIN_STATIC
 ################################
 add_subdirectory(util)
 add_subdirectory(numbers)
-#add_subdirectory(numbers_boost)
 add_subdirectory(core)
 add_subdirectory(formula)
 add_subdirectory(interval)
-add_subdirectory(benchmarks)
-# Only for debugging.
-#add_subdirectory(debug)
 
 if (CLANG_TIDY)
  add_custom_target(tidy-tests