Add helper functions for warning and info, simplify error handling

Author: adrienbernede

scripts/gitlab/build_and_test.sh

@@ -55,6 +55,20 @@ print_error ()
     echo -e "\e[31m[Error]: ${error_msg}\e[0m"
 }
 
+# Helper function to print warnings in gray
+print_warning ()
+{
+    local warning_msg="${1}"
+    echo -e "\e[1;30m[Warning]: ${warning_msg}\e[0m"
+}
+
+# Helper function to print information
+print_info ()
+{
+    local info_msg="${1}"
+    echo -e "[Information]: ${info_msg}"
+}
+
 # GitLab CI collapsible section helpers with nesting support
 section_start ()
 {
@@ -127,18 +141,18 @@ section_end ()
 
 if [[ ${debug_mode} == true ]]
 then
-    echo "[Information]: Debug mode:"
-    echo "[Information]: - Spack debug mode."
-    echo "[Information]: - Deactivated shared memory."
-    echo "[Information]: - Do not push to buildcache."
+    print_info "Debug mode:"
+    print_info "- Spack debug mode."
+    print_info "- Deactivated shared memory."
+    print_info "- Do not push to buildcache."
     use_dev_shm=false
     spack_debug=true
     push_to_registry=false
 fi
 
 if [[ -n ${module_list} ]]
 then
-    echo "[Information]: Loading modules: ${module_list}"
+    print_info "Loading modules: ${module_list}"
     module load ${module_list}
 fi
 
@@ -161,8 +175,8 @@ else
     prefix="${project_dir}/../spack-and-build-root"
 fi
 
-echo "[Information]: Creating directory ${prefix}"
-echo "[Information]: project_dir: ${project_dir}"
+print_info "Creating directory ${prefix}"
+print_info "project_dir: ${project_dir}"
 
 mkdir -p ${prefix}
 
@@ -249,7 +263,7 @@ else
 fi
 
 hostconfig=$(basename ${hostconfig_path})
-echo "[Information]: Found hostconfig ${hostconfig_path}"
+print_info "Found hostconfig ${hostconfig_path}"
 
 # Build Directory
 # When using /dev/shm, we use prefix for both spack builds and source build, unless BUILD_ROOT was defined
@@ -263,11 +277,11 @@ cmake_exe=`grep 'CMake executable' ${hostconfig_path} | cut -d ':' -f 2 | xargs`
 # Build
 if [[ "${option}" != "--deps-only" && "${option}" != "--test-only" ]]
 then
-    echo "[Information]: Prefix       ${prefix}"
-    echo "[Information]: Host-config  ${hostconfig_path}"
-    echo "[Information]: Build Dir    ${build_dir}"
-    echo "[Information]: Project Dir  ${project_dir}"
-    echo "[Information]: Install Dir  ${install_dir}"
+    print_info "Prefix       ${prefix}"
+    print_info "Host-config  ${hostconfig_path}"
+    print_info "Build Dir    ${build_dir}"
+    print_info "Project Dir  ${project_dir}"
+    print_info "Install Dir  ${install_dir}"
 
     section_start "clean" "Cleaning working directory" "collapsed"
     # Map CPU core allocations
@@ -297,44 +311,43 @@ then
       -DCMAKE_INSTALL_PREFIX=${install_dir} \
       ${project_dir}
       then
+        status=$?
         section_end
         print_error "CMake configuration failed, dumping output..."
-        section_start "cmake_config_verbose" "Verbose CMake Configuration"
-        if ! $cmake_exe \
+
+        $cmake_exe \
           -C ${hostconfig_path} \
           ${cmake_options} \
           -DCMAKE_INSTALL_PREFIX=${install_dir} \
           ${project_dir} --debug-output --trace-expand
-        then
-          verbose_status=$?
-          section_end
-          exit ${verbose_status}
-        fi
-        section_end
-        exit 1
-      else
-        section_end
+
+        exit ${status}
     fi
+    section_end
 
     section_start "build" "Building Umpire" "collapsed"
     if ! $cmake_exe --build . -j ${core_counts[$truehostname]}
     then
+        status=$?
         section_end
         print_error "Compilation failed, building with verbose output..."
-        section_start "build_verbose" "Verbose Rebuild" "collapsed"
+
         $cmake_exe --build . --verbose -j 1
+
+        exit ${status}
+    fi
+    section_end
+
+    section_start "install" "Installing Umpire" "collapsed"
+    if ! $cmake_exe --install .
+    then
+        status=$?
         section_end
-    else
-        section_end
-        section_start "install" "Installing Umpire" "collapsed"
-        if ! $cmake_exe --install .
-        then
-            section_end
-            print_error "Installation failed."
-            exit 1
-        fi
-        section_end
+        print_error "Installation failed."
+
+        exit ${status}
     fi
+    section_end
 fi
 
 # Test
@@ -389,8 +402,8 @@ then
     section_start "install_test" "Testing Installed Examples" "collapsed"
     if grep -q -i "ENABLE_HIP.*ON" ${hostconfig_path}
     then
-        echo "[Warning]: Not testing install with HIP"
         section_end
+        echo "[Warning]: Not testing install with HIP"
     else
         if [[ ! -d ${install_dir} ]]
         then