Skip to content

Commit

Permalink
Merge pull request #352 from DARMA-tasking/351-fix-false-positive-pip…
Browse files Browse the repository at this point in the history
…eline

#351: Update build against vt CI to fail properly
  • Loading branch information
lifflander authored Jun 20, 2024
2 parents 2258b37 + 83c1312 commit 19b568f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 16 deletions.
16 changes: 1 addition & 15 deletions ci/build_against_vt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -88,31 +88,17 @@ cmake -G "${CMAKE_GENERATOR:-Ninja}" \
-DCMAKE_CXX_COMPILER="${CXX:-c++}" \
-DCMAKE_C_COMPILER="${CC:-cc}" \
-DCMAKE_EXE_LINKER_FLAGS="${CMAKE_EXE_LINKER_FLAGS:-}" \
-Dcheckpoint_DIR="${CHECKPOINT_BUILD}/install" \
-Dcheckpoint_ROOT="${CHECKPOINT_BUILD}/install" \
-DCMAKE_PREFIX_PATH="${CMAKE_PREFIX_PATH:-}" \
-DCMAKE_INSTALL_PREFIX="${VT_BUILD}/install" \
-Dvt_ci_build="${VT_CI_BUILD:-1}" \
-Dvt_debug_verbose="${VT_DEBUG_VERBOSE:-}" \
-Dvt_tests_num_nodes="${VT_TESTS_NUM_NODES:-}" \
"${VT}"
cmake_conf_ret="$?"

time cmake --build . --target "${target}"
compilation_ret="$?"

if test "${use_ccache}"
then
{ echo -e "===\n=== ccache statistics after build\n==="; } 2>/dev/null
ccache -s
fi

# Exit with error code if there was any
if test "${cmake_conf_ret}" -ne 0
then
echo "There was an error during CMake configuration"
exit "${cmake_conf_ret}"
elif test "${compilation_ret}" -ne 0
then
echo "There was an error during compilation"
exit "${compilation_ret}"
fi
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ services:
volumes: *ubuntu-volumes
command: &build-against-vt-cpp-command >
/bin/bash -c "
/checkpoint/ci/build_against_vt.sh /vt /build /checkpoint
/checkpoint/ci/build_against_vt.sh /vt /build /checkpoint &&
/vt/ci/test_cpp.sh /vt /build"

##############################################################################
Expand Down

0 comments on commit 19b568f

Please sign in to comment.