From 95f8114e494118fce5c54fa724cb38cac48e8b86 Mon Sep 17 00:00:00 2001 From: Matt Dawson Date: Tue, 2 Sep 2025 14:19:54 -0700 Subject: [PATCH 1/5] update test config --- .github/workflows/Ubuntu.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/Ubuntu.yml b/.github/workflows/Ubuntu.yml index d92ab1d..b7081fd 100644 --- a/.github/workflows/Ubuntu.yml +++ b/.github/workflows/Ubuntu.yml @@ -30,6 +30,12 @@ jobs: - name: Checkout code uses: actions/checkout@v4 + - name: Install dependencies + run: | + sudo apt-get update + sudo apt-get install -y cmake gfortran libnetcdf-dev netcdf-bin libnetcdff-dev liblapack-dev liblapacke-dev + sudo apt-get install -y libblas-dev + - name: Run Cmake run: cmake -S . -B build -D CMAKE_BUILD_TYPE=${{ matrix.build_type }} -D CARMA_ENABLE_NETCDF=${{ matrix.enable_netcdf }} -D CARMA_ENABLE_MEMCHECK=ON -D CMAKE_POLICY_VERSION_MINIMUM=3.5 From 9a40f79d607c315597729e7fdb527961467b96e7 Mon Sep 17 00:00:00 2001 From: Matt Dawson Date: Tue, 2 Sep 2025 14:22:48 -0700 Subject: [PATCH 2/5] update to include submodules --- .github/workflows/Ubuntu.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/Ubuntu.yml b/.github/workflows/Ubuntu.yml index b7081fd..7de7143 100644 --- a/.github/workflows/Ubuntu.yml +++ b/.github/workflows/Ubuntu.yml @@ -29,6 +29,8 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v4 + with: + submodules: 'recursive' - name: Install dependencies run: | From b929168ba9e1a7fb51f1dcd3f30ad54e84d83b1d Mon Sep 17 00:00:00 2001 From: Matt Dawson Date: Tue, 2 Sep 2025 14:27:50 -0700 Subject: [PATCH 3/5] set unlimited line length --- .github/workflows/Ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Ubuntu.yml b/.github/workflows/Ubuntu.yml index 7de7143..d755475 100644 --- a/.github/workflows/Ubuntu.yml +++ b/.github/workflows/Ubuntu.yml @@ -39,7 +39,7 @@ jobs: sudo apt-get install -y libblas-dev - name: Run Cmake - run: cmake -S . -B build -D CMAKE_BUILD_TYPE=${{ matrix.build_type }} -D CARMA_ENABLE_NETCDF=${{ matrix.enable_netcdf }} -D CARMA_ENABLE_MEMCHECK=ON -D CMAKE_POLICY_VERSION_MINIMUM=3.5 + run: cmake -S . -B build -D CMAKE_BUILD_TYPE=${{ matrix.build_type }} -D CARMA_ENABLE_NETCDF=${{ matrix.enable_netcdf }} -D CARMA_ENABLE_MEMCHECK=ON -D CMAKE_POLICY_VERSION_MINIMUM=3.5 -D CMAKE_Fortran_FLAGS="-ffree-line-length-none" - name: Build run: cmake --build build --config ${{ matrix.build_type }} --parallel 10 From 241f40d9de50dc40519e1d7dfe1605cbabefe307 Mon Sep 17 00:00:00 2001 From: Matt Dawson Date: Tue, 2 Sep 2025 16:19:33 -0700 Subject: [PATCH 4/5] remove parallel builds --- .github/workflows/Ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Ubuntu.yml b/.github/workflows/Ubuntu.yml index d755475..f70f702 100644 --- a/.github/workflows/Ubuntu.yml +++ b/.github/workflows/Ubuntu.yml @@ -42,7 +42,7 @@ jobs: run: cmake -S . -B build -D CMAKE_BUILD_TYPE=${{ matrix.build_type }} -D CARMA_ENABLE_NETCDF=${{ matrix.enable_netcdf }} -D CARMA_ENABLE_MEMCHECK=ON -D CMAKE_POLICY_VERSION_MINIMUM=3.5 -D CMAKE_Fortran_FLAGS="-ffree-line-length-none" - name: Build - run: cmake --build build --config ${{ matrix.build_type }} --parallel 10 + run: cmake --build build --config ${{ matrix.build_type }} - name: Run tests run: | From 2ce390750ef859fcc37f4527e2f9bcc5d9ac987e Mon Sep 17 00:00:00 2001 From: Matt Dawson Date: Tue, 2 Sep 2025 16:34:33 -0700 Subject: [PATCH 5/5] add valgrind to action tests --- .github/workflows/Ubuntu.yml | 2 +- cmake/test_util.cmake | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Ubuntu.yml b/.github/workflows/Ubuntu.yml index f70f702..86283a7 100644 --- a/.github/workflows/Ubuntu.yml +++ b/.github/workflows/Ubuntu.yml @@ -36,7 +36,7 @@ jobs: run: | sudo apt-get update sudo apt-get install -y cmake gfortran libnetcdf-dev netcdf-bin libnetcdff-dev liblapack-dev liblapacke-dev - sudo apt-get install -y libblas-dev + sudo apt-get install -y libblas-dev valgrind - name: Run Cmake run: cmake -S . -B build -D CMAKE_BUILD_TYPE=${{ matrix.build_type }} -D CARMA_ENABLE_NETCDF=${{ matrix.enable_netcdf }} -D CARMA_ENABLE_MEMCHECK=ON -D CMAKE_POLICY_VERSION_MINIMUM=3.5 -D CMAKE_Fortran_FLAGS="-ffree-line-length-none" diff --git a/cmake/test_util.cmake b/cmake/test_util.cmake index f7e522d..45f7543 100644 --- a/cmake/test_util.cmake +++ b/cmake/test_util.cmake @@ -3,6 +3,9 @@ if(CARMA_ENABLE_MEMCHECK) find_program(MEMORYCHECK_COMMAND "valgrind") + if(NOT MEMORYCHECK_COMMAND) + message(FATAL_ERROR "Could not find valgrind for memory checking") + endif() endif() ################################################################################