From 6603c06c1daae557c39bb8ac57248d15666440bd Mon Sep 17 00:00:00 2001 From: Jan Breuer <74359367+jbreue16@users.noreply.github.com> Date: Tue, 8 Oct 2024 12:49:37 +0200 Subject: [PATCH 1/2] Add CI workflow --- .github/workflows/ci.yml | 62 ++++++++++++++++++++++++++++++++ include/io/FileIO.hpp | 1 + include/io/ParameterProvider.hpp | 1 + 3 files changed, 64 insertions(+) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..9bad7f2 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,62 @@ +name: CI + +on: + push: + branches: + - main + pull_request: + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Install system dependencies + run: | + sudo apt-get update + sudo apt-get install -y \ + build-essential \ + cmake \ + libhdf5-dev \ + libgmp-dev \ + libmpfr-dev \ + libmpc-dev \ + libeigen3-dev; + + - name: Download CADET-semi-analytic dependencies + run: | + # Download and build the required libraries if needed + # Note: Add commands here if any libraries need to be downloaded and built + + - name: Create build directory + run: mkdir build && cd build + + - name: Run CMake + working-directory: build + run: | + # Set environment variables for CMake to locate libraries + export GMP_ROOT=/usr/include + export MPFR_ROOT=/usr/include + export MPC_ROOT=/usr/include + export HDF5_ROOT=/usr/include + cmake -DCMAKE_INSTALL_PREFIX=install/ \ + -DCMAKE_CXX_COMPILER=g++ \ + -DCMAKE_C_COMPILER=gcc \ + -DUSE_FADBAD=ON \ + -DENABLE_TESTS=OFF \ + .. + + - name: Build + working-directory: build + run: make -j$(nproc) + + - name: Install + working-directory: build + run: make install + + - name: Verify installation + run: | + ./build/install/bin/chromatogram --version diff --git a/include/io/FileIO.hpp b/include/io/FileIO.hpp index 05f0e04..13f7184 100644 --- a/include/io/FileIO.hpp +++ b/include/io/FileIO.hpp @@ -17,6 +17,7 @@ #include #include +#include #include "casemaCompilerInfo.hpp" diff --git a/include/io/ParameterProvider.hpp b/include/io/ParameterProvider.hpp index bfc6159..1bf5914 100644 --- a/include/io/ParameterProvider.hpp +++ b/include/io/ParameterProvider.hpp @@ -17,6 +17,7 @@ #include #include +#include #include "casemaCompilerInfo.hpp" From 364d0209ad8d44465c02985b9dbb2f9b2485e29e Mon Sep 17 00:00:00 2001 From: Jan Breuer Date: Thu, 17 Oct 2024 20:51:24 +0200 Subject: [PATCH 2/2] Update version info --- include/TclapUtils.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/TclapUtils.hpp b/include/TclapUtils.hpp index 82880bd..f6fbc3a 100644 --- a/include/TclapUtils.hpp +++ b/include/TclapUtils.hpp @@ -39,8 +39,8 @@ namespace TCLAP { std::cout << "This is " << _progName << " version " << casema::getVersion() << " (" << casema::getBranchRefspec() << " branch)\n"; std::cout << "Built from commit " << casema::getCommitHash() << "\n"; - std::cout << "CASEMA homepage: \n"; - std::cout << "Fork CASEMA on GitHub: \n"; + std::cout << "CADET homepage: \n"; + std::cout << "Fork CADET-Semi-Analytic on GitHub: \n"; std::cout << "Report bugs to the issue tracker on GitHub or " << std::endl; }