Skip to content

Commit ae87421

Browse files
committed
Try setting pygeosx cmake arg on command line
1 parent e01ac6b commit ae87421

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

.github/workflows/build_and_test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,8 @@ jobs:
154154
155155
156156
# pygeosx testing
157-
ENABLE_PYGEOSX=${{ inputs.ENABLE_PYGEOSX }}
158-
docker_args+=(-e ENABLE_PYGEOSX=${ENABLE_PYGEOSX:-OFF})
157+
#ENABLE_PYGEOSX=${{ inputs.ENABLE_PYGEOSX }}
158+
#docker_args+=(-e ENABLE_PYGEOSX=${ENABLE_PYGEOSX:-OFF})
159159
if [ "${{ inputs.ENABLE_PYGEOSX }}" == 'ON' ]; then
160160
script_args+=(--run-pygeosx-tests)
161161
fi

scripts/ci_build_and_test_in_container.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,10 @@ if [[ "${RUN_INTEGRATED_TESTS}" = true ]]; then
184184
ATS_CMAKE_ARGS="-DATS_ARGUMENTS=\"--machine openmpi --ats openmpi_mpirun=/usr/bin/mpirun --ats openmpi_args=--allow-run-as-root --ats openmpi_procspernode=4 --ats openmpi_maxprocs=4\" -DPython3_ROOT_DIR=${ATS_PYTHON_HOME}"
185185
fi
186186

187+
# Set CMake option for pygeosx
188+
if [[ "${RUN_PYGEOSX_TESTS}" = true ]]; then
189+
PYGEOSX_CMAKE_ARG="-DENABLE_PYGEOSX=ON"
190+
fi
187191

188192
if [[ "${CODE_COVERAGE}" = true ]]; then
189193
or_die apt-get update
@@ -216,7 +220,8 @@ or_die python3 scripts/config-build.py \
216220
-DGEOSX_INSTALL_SCHEMA=${GEOSX_INSTALL_SCHEMA} \
217221
-DENABLE_COVERAGE=$([[ "${CODE_COVERAGE}" = true ]] && echo 1 || echo 0) \
218222
${SCCACHE_CMAKE_ARGS} \
219-
${ATS_CMAKE_ARGS}
223+
${ATS_CMAKE_ARGS} \
224+
${PYGEOSX_CMAKE_ARG}
220225

221226
# The configuration step is now over, we can now move to the build directory for the build!
222227
or_die cd ${GEOSX_BUILD_DIR}

0 commit comments

Comments
 (0)