From 97efa0f707ba6bb915b9a07e16e35c4c02e46add Mon Sep 17 00:00:00 2001 From: Caila Finn Date: Fri, 4 Oct 2024 15:03:19 +0100 Subject: [PATCH 1/2] Output build logs to a file for plugin to check RE #38148 --- buildconfig/Jenkins/Conda/conda-buildscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildconfig/Jenkins/Conda/conda-buildscript b/buildconfig/Jenkins/Conda/conda-buildscript index cb9ba9c8ae1d..db87719f3b5a 100755 --- a/buildconfig/Jenkins/Conda/conda-buildscript +++ b/buildconfig/Jenkins/Conda/conda-buildscript @@ -149,7 +149,7 @@ if [[ $ENABLE_DOCS == true ]]; then fi # Run the script that handles the build -$SCRIPT_DIR/build $WORKSPACE $CMAKE_PRESET $ENABLE_DOCS $ENABLE_DEV_DOCS $ENABLE_BUILD_CODE $ENABLE_UNIT_TESTS $ENABLE_SYSTEM_TESTS $ENABLE_DOC_TESTS $ENABLE_COVERITY "$EXTRA_CMAKE_FLAGS" $BUILD_THREADS +$SCRIPT_DIR/build $WORKSPACE $CMAKE_PRESET $ENABLE_DOCS $ENABLE_DEV_DOCS $ENABLE_BUILD_CODE $ENABLE_UNIT_TESTS $ENABLE_SYSTEM_TESTS $ENABLE_DOC_TESTS $ENABLE_COVERITY "$EXTRA_CMAKE_FLAGS" $BUILD_THREADS | tee test_logs/build_$OSTYPE.log # Run unit and system tests $SCRIPT_DIR/run-tests $WORKSPACE $ENABLE_SYSTEM_TESTS $ENABLE_UNIT_TESTS $ENABLE_DOCS $ENABLE_DOC_TESTS $BUILD_THREADS From 7d0a2839b48b5ef4962651d6560f0de1a58c0370 Mon Sep 17 00:00:00 2001 From: Caila Finn Date: Fri, 4 Oct 2024 15:33:46 +0100 Subject: [PATCH 2/2] Fix issue with non-existant directory RE #38148 --- buildconfig/Jenkins/Conda/conda-buildscript | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/buildconfig/Jenkins/Conda/conda-buildscript b/buildconfig/Jenkins/Conda/conda-buildscript index db87719f3b5a..5b9f843711a9 100755 --- a/buildconfig/Jenkins/Conda/conda-buildscript +++ b/buildconfig/Jenkins/Conda/conda-buildscript @@ -141,6 +141,8 @@ fi rm -f -- *.dmg *.rpm *.deb *.tar.gz *.tar.xz *.exe # Remove test logs from previous builds rm -rf $BUILD_DIR/test_logs +# Remake the directory for the test logs. +mkdir $BUILD_DIR/test_logs # Set locale to avoid problems building the docs # See https://unix.stackexchange.com/questions/87745/what-does-lc-all-c-do @@ -149,7 +151,7 @@ if [[ $ENABLE_DOCS == true ]]; then fi # Run the script that handles the build -$SCRIPT_DIR/build $WORKSPACE $CMAKE_PRESET $ENABLE_DOCS $ENABLE_DEV_DOCS $ENABLE_BUILD_CODE $ENABLE_UNIT_TESTS $ENABLE_SYSTEM_TESTS $ENABLE_DOC_TESTS $ENABLE_COVERITY "$EXTRA_CMAKE_FLAGS" $BUILD_THREADS | tee test_logs/build_$OSTYPE.log +$SCRIPT_DIR/build $WORKSPACE $CMAKE_PRESET $ENABLE_DOCS $ENABLE_DEV_DOCS $ENABLE_BUILD_CODE $ENABLE_UNIT_TESTS $ENABLE_SYSTEM_TESTS $ENABLE_DOC_TESTS $ENABLE_COVERITY "$EXTRA_CMAKE_FLAGS" $BUILD_THREADS | tee $BUILD_DIR/test_logs/build_$OSTYPE.log # Run unit and system tests $SCRIPT_DIR/run-tests $WORKSPACE $ENABLE_SYSTEM_TESTS $ENABLE_UNIT_TESTS $ENABLE_DOCS $ENABLE_DOC_TESTS $BUILD_THREADS