From 672a6c1cbab551a4dd7d69e81e8f3ddffbc46b5e Mon Sep 17 00:00:00 2001
From: tbeltzun <129868353+tbeltzun@users.noreply.github.com>
Date: Fri, 17 Nov 2023 09:48:05 +0100
Subject: [PATCH] simplify script

---
 scripts/ci_build_and_test.sh | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/scripts/ci_build_and_test.sh b/scripts/ci_build_and_test.sh
index 96ab65f7adc..72c47e1d93f 100755
--- a/scripts/ci_build_and_test.sh
+++ b/scripts/ci_build_and_test.sh
@@ -35,17 +35,15 @@ dargs+=(--name=${CONTAINER_NAME})
 dargs+=(--volume=${BUILD_DIR}:${BUILD_DIR_MOUNT_POINT})
 dargs+=(--cap-add=ALL)
 
-if [ ${CMAKE_BUILD_TYPE} == 'Debug' ]; then
-  dargs+=(--memory-swap='-1')
-fi
+dargs+=(-e HOST_CONFIG=${HOST_CONFIG:-host-configs/environment.cmake})
+dargs+=(-e GEOSX_DIR=${GEOSX_DIR})
+dargs+=(-e ENABLE_HYPRE=${ENABLE_HYPRE:-OFF})
+dargs+=(-e ENABLE_HYPRE_DEVICE=${ENABLE_HYPRE_DEVICE:-CPU})
+dargs+=(-e ENABLE_TRILINOS=${ENABLE_TRILINOS:-ON})
+dargs+=(-e CMAKE_BUILD_TYPE)
 
 # Now we can build GEOSX.
 docker run "${dargs[@]}" \
-  -e HOST_CONFIG=${HOST_CONFIG:-host-configs/environment.cmake} \
-  -e CMAKE_BUILD_TYPE \
-  -e GEOSX_DIR=${GEOSX_DIR} \
-  -e ENABLE_HYPRE=${ENABLE_HYPRE:-OFF} \
-  -e ENABLE_HYPRE_DEVICE=${ENABLE_HYPRE_DEVICE:-CPU} \
-  -e ENABLE_TRILINOS=${ENABLE_TRILINOS:-ON} \
-  ${DOCKER_REPOSITORY}:${GEOSX_TPL_TAG} \
-  ${BUILD_DIR_MOUNT_POINT}/scripts/ci_build_and_test_in_container.sh ${BUILD_AND_TEST_ARGS} ${SCCACHE_CLI};
+${DOCKER_REPOSITORY}:${GEOSX_TPL_TAG} \
+${BUILD_DIR_MOUNT_POINT}/scripts/ci_build_and_test_in_container.sh \
+${BUILD_AND_TEST_ARGS} ${SCCACHE_CLI};