From 4fd6d347bc6cc4493d86d5432badab176e1011ea Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Mon, 5 Aug 2024 15:55:21 -0400 Subject: [PATCH] CI: Clean up scripts --- scripts/actions-oneapi-real64.cfg | 2 +- scripts/build.sh | 15 +-------------- scripts/test.sh | 13 ++----------- 3 files changed, 4 insertions(+), 26 deletions(-) diff --git a/scripts/actions-oneapi-real64.cfg b/scripts/actions-oneapi-real64.cfg index 36cf1d979..972d35a73 100644 --- a/scripts/actions-oneapi-real64.cfg +++ b/scripts/actions-oneapi-real64.cfg @@ -15,7 +15,7 @@ FC = gfortran F90 = gfortran LD = /opt/intel/oneapi/compiler/2024.2/bin/icpx -# -g +# -g # Debug information uses too much disk space on CI CPPFLAGS = -DSIMD_DISABLE -DSIMD_CPU CFLAGS = -fp-model=precise -march=x86-64-v3 -pipe -std=gnu11 CXXFLAGS = -fp-model=precise -fsycl -march=x86-64-v3 -pipe -std=c++17 diff --git a/scripts/build.sh b/scripts/build.sh index a0bd893fa..03bc67a02 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -1,6 +1,6 @@ #!/bin/bash -# set -ex +set -ex export CARPETXSPACE="$PWD" export WORKSPACE="$PWD/../workspace" @@ -32,18 +32,5 @@ esac time ./simfactory/bin/sim --machine="actions-$ACCELERATOR-$REAL_PRECISION" build "$mode" --jobs $(nproc) sim 2>&1 | tee build.log -# TODO -du -sh $WORKSPACE -du -sh $WORKSPACE/configs/sim -du -sh $WORKSPACE/configs/sim/build -du -sh $WORKSPACE/configs/sim/lib -du -sh $WORKSPACE/configs/sim/scratch -du -sh $WORKSPACE/configs/sim/* -du -sh $WORKSPACE/configs/sim/build/* -du -sh $WORKSPACE/configs/sim/lib/* -du -sh $WORKSPACE/configs/sim/scratch/* - # Check whether the executable exists and is executable test -x exe/cactus_sim - -exit $? # TODO diff --git a/scripts/test.sh b/scripts/test.sh index 43a297323..0b3de8b7f 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -59,21 +59,12 @@ for errfile in $(find "${ONEPROC_DIR}/../.." "${TWOPROC_DIR}/../.." -name '*.err echo '================================================================================' done -# TESTS_FAILED=False -# for test_dir in "${ONEPROC_DIR}" "${TWOPROC_DIR}"; do -# log="${test_dir}/summary.log" -# if ! grep -q '^ Number failed -> 0$' ${log}; then -# TESTS_FAILED=True -# fi -# done -# echo "TESTS_FAILED=${TESTS_FAILED}" >>"${GITHUB_ENV}" - for test_dir in "${ONEPROC_DIR}" "${TWOPROC_DIR}"; do log="${test_dir}/summary.log" if ! grep -q '^ Number failed -> 0$' ${log}; then - # Failure + echo 'FAILURE' exit 1 fi done -# Success +echo 'SUCCESS' exit 0