From 90ff8fd0014288ab3d0090339a9cce5fa9159b2a Mon Sep 17 00:00:00 2001 From: jcschaff Date: Mon, 27 May 2024 20:47:20 -0400 Subject: [PATCH] unify builds, without smoldyn exe --- .github/workflows/cd.yml | 25 +++++++------------------ Dockerfile | 2 ++ 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 3db61e926..c6bf330ef 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -106,16 +106,9 @@ jobs: -DCMAKE_CXX_COMPILER=/opt/homebrew/opt/llvm/bin/clang++ \ -DOPTION_MINGW=ON \ -DOPTION_TARGET_MESSAGING=OFF \ - -DOPTION_TARGET_PARALLEL=OFF \ - -DOPTION_TARGET_CHOMBO2D_SOLVER=OFF \ - -DOPTION_TARGET_CHOMBO3D_SOLVER=OFF \ - -DOPTION_TARGET_SMOLDYN_SOLVER=ON \ + -DOPTION_TARGET_SMOLDYN_SOLVER=OFF \ -DOPTION_TARGET_FV_SOLVER=ON \ - -DOPTION_TARGET_STOCHASTIC_SOLVER=ON \ - -DOPTION_TARGET_NFSIM_SOLVER=ON \ - -DOPTION_TARGET_MOVINGBOUNDARY_SOLVER=ON \ - -DOPTION_TARGET_SUNDIALS_SOLVER=ON \ - -DOPTION_TARGET_HY3S_SOLVERS=OFF \ + -DOPTION_TARGET_DOCS=ON \ -B . -S .. ninja @@ -137,16 +130,9 @@ jobs: -DCMAKE_CXX_COMPILER=/usr/local/opt/llvm/bin/clang++ \ -DOPTION_MINGW=ON \ -DOPTION_TARGET_MESSAGING=OFF \ - -DOPTION_TARGET_PARALLEL=OFF \ - -DOPTION_TARGET_CHOMBO2D_SOLVER=OFF \ - -DOPTION_TARGET_CHOMBO3D_SOLVER=OFF \ - -DOPTION_TARGET_SMOLDYN_SOLVER=ON \ + -DOPTION_TARGET_SMOLDYN_SOLVER=OFF \ -DOPTION_TARGET_FV_SOLVER=ON \ - -DOPTION_TARGET_STOCHASTIC_SOLVER=ON \ - -DOPTION_TARGET_NFSIM_SOLVER=ON \ - -DOPTION_TARGET_MOVINGBOUNDARY_SOLVER=ON \ - -DOPTION_TARGET_SUNDIALS_SOLVER=ON \ - -DOPTION_TARGET_HY3S_SOLVERS=OFF \ + -DOPTION_TARGET_DOCS=ON \ -B . -S .. ninja @@ -220,6 +206,7 @@ jobs: -DCMAKE_C_COMPILER="clang.exe" \ -DCMAKE_CXX_COMPILER="clang++.exe" \ -DOPTION_TARGET_MESSAGING=OFF \ + -DOPTION_TARGET_SMOLDYN_SOLVER=OFF \ -DOPTION_TARGET_FV_SOLVER=ON \ -DOPTION_TARGET_DOCS=OFF \ -B . -S .. @@ -267,7 +254,9 @@ jobs: cmake \ -G Ninja \ -DOPTION_TARGET_MESSAGING=OFF \ + -DOPTION_TARGET_SMOLDYN_SOLVER=OFF \ -DOPTION_TARGET_FV_SOLVER=ON \ + -DOPTION_TARGET_DOCS=ON \ -B . -S .. ninja diff --git a/Dockerfile b/Dockerfile index dea64d043..b588f8929 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,9 @@ WORKDIR /vcellroot/build RUN /usr/bin/cmake \ -DOPTION_TARGET_MESSAGING=ON \ + -DOPTION_TARGET_SMOLDYN_SOLVER=OFF \ -DOPTION_TARGET_FV_SOLVER=ON \ + -DOPTION_TARGET_DOCS=OFF \ .. && \ make && \ ctest