From cf170833e32a91a7dfea12461f5e1da5806e8efc Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Thu, 23 Jan 2025 09:50:37 -0700 Subject: [PATCH 1/2] change cmake option BUILD_TESTING to BUILD_CI_TESTING --- .github/workflows/GCC.yml | 2 +- CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/GCC.yml b/.github/workflows/GCC.yml index 4f8bbf7b5..44d827db0 100644 --- a/.github/workflows/GCC.yml +++ b/.github/workflows/GCC.yml @@ -120,7 +120,7 @@ jobs: export CC=mpicc export CXX=mpicxx export FC=mpif90 - cmake ${GITHUB_WORKSPACE}/fv3atm -DBUILD_TESTING=ON ${{ matrix.cmake_opts }} ${{ env.gcov_cmake }} + cmake ${GITHUB_WORKSPACE}/fv3atm -DBUILD_CI_TESTING=ON ${{ matrix.cmake_opts }} ${{ env.gcov_cmake }} make -j2 - name: run-tests diff --git a/CMakeLists.txt b/CMakeLists.txt index cef00a251..b4df7eda7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ if(ENABLE_FV3ATM_DOCS) endif() # Enable CI build & unit testing: -if(BUILD_TESTING) +if(BUILD_CI_TESTING) project(fv3atm VERSION 1.0 LANGUAGES C CXX Fortran) include(ci/CMakeLists.txt) endif() @@ -165,7 +165,7 @@ if(OPENMP) target_link_libraries(fv3atm PUBLIC OpenMP::OpenMP_Fortran) endif() -if(BUILD_TESTING) +if(BUILD_CI_TESTING) include(CTest) add_subdirectory(tests) endif() From 450bdccaf639ebbba9ed6158065bff4239d96e17 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Sun, 2 Feb 2025 09:38:49 -0700 Subject: [PATCH 2/2] fixed workflow --- .github/workflows/docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index fbc145e65..1137d4b88 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -119,7 +119,7 @@ jobs: export CC=mpicc export CXX=mpicxx export FC=mpif90 - cmake ${GITHUB_WORKSPACE}/fv3atm -DBUILD_TESTING=ON ${{ matrix.cmake_opts }} -DENABLE_FV3ATM_DOCS=ON ${{ env.gcov_cmake }} + cmake ${GITHUB_WORKSPACE}/fv3atm -DBUILD_CI_TESTING=ON ${{ matrix.cmake_opts }} -DENABLE_FV3ATM_DOCS=ON ${{ env.gcov_cmake }} make doxygen_doc - name: upload-docs