diff --git a/lib/functions/host/docker.sh b/lib/functions/host/docker.sh index 5c412c95b4..f29c579bca 100644 --- a/lib/functions/host/docker.sh +++ b/lib/functions/host/docker.sh @@ -578,7 +578,8 @@ function docker_cli_launch() { display_alert "-------------Docker run finished after ${SECONDS}s------------------------" "🐳 successfull" "info" else docker_build_result=$? # capture exit code of test done 4 lines above. - display_alert "-------------Docker run failed after ${SECONDS}s--------------------------" "🐳 failed" "err" + # No use polluting GHA/CI with notices about Docker failure (real failure, inside Docker, generated enough errors already) skip_ci_special="yes" + skip_ci_special="yes" display_alert "-------------Docker run failed after ${SECONDS}s--------------------------" "🐳 failed" "err" fi # Find and show the path to the log file for the ARMBIAN_BUILD_UUID. diff --git a/lib/functions/logging/display-alert.sh b/lib/functions/logging/display-alert.sh index 8b4b91f437..c89dd2081f 100644 --- a/lib/functions/logging/display-alert.sh +++ b/lib/functions/logging/display-alert.sh @@ -198,7 +198,7 @@ function display_alert() { echo -e "${normal_color}${left_marker:-}${padding:-}${level_indicator}${padding}${normal_color}${right_marker:-}${timing_info}${pids_info}${bashopts_info} ${normal_color}${message}${extra}${normal_color}" >&2 # Now write to CI, if we're running on it. Remove ANSI escapes which confuse GitHub Actions. - if [[ "${CI}" == "true" ]] && [[ "${ci_log}" != "" ]]; then + if [[ "${CI}" == "true" ]] && [[ "${ci_log}" != "" ]] && [[ "${skip_ci_special:-"no"}" != "yes" ]]; then echo -e "::${ci_log} ::" "${1} ${2}" | sed 's/\x1b\[[0-9;]*m//g' >&2 fi diff --git a/lib/functions/logging/traps.sh b/lib/functions/logging/traps.sh index bf4f4cbe9e..e658330792 100644 --- a/lib/functions/logging/traps.sh +++ b/lib/functions/logging/traps.sh @@ -108,7 +108,8 @@ function run_cleanup_handlers() { return 0 # No handlers set, just return. else if [[ ${cleanup_exit_code:-0} -gt 0 ]]; then - display_alert "Cleaning up" "please wait for cleanups to finish" "error" + # No use polluting GHA/CI with notices about cleanup, if we're already failing. skip_ci_special="yes" + skip_ci_special="yes" display_alert "Cleaning up" "please wait for cleanups to finish" "error" else display_alert "Cleaning up" "please wait for cleanups to finish" "info" fi