ci: use quiet alias for commands

And set x_off again when nesting these functions but we're not done and
we have more after.

Fixes: d69bd58365 ("ci: consistently restore `-x` after temporarily disabling it")
(cherry picked from commit e5708ab2b4)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32119>
This commit is contained in:
Eric Engestrom
2024-11-08 09:18:58 +01:00
committed by Dylan Baker
parent 6965aff4d1
commit eb34c059be
2 changed files with 12 additions and 9 deletions

View File

@@ -50,13 +50,13 @@ function _build_section_start {
alias build_section_start="x_off; _build_section_start"
function _section_start {
_build_section_start "[collapsed=true]" $*
build_section_start "[collapsed=true]" $*
x_restore
}
alias section_start="x_off; _section_start"
function _uncollapsed_section_start {
_build_section_start "" $*
build_section_start "" $*
x_restore
}
alias uncollapsed_section_start="x_off; _uncollapsed_section_start"
@@ -69,7 +69,7 @@ function _build_section_end {
alias build_section_end="x_off; _build_section_end"
function _section_end {
_build_section_end $*
build_section_end $*
x_restore
}
alias section_end="x_off; _section_end"
@@ -77,9 +77,10 @@ alias section_end="x_off; _section_end"
function _section_switch {
if [ -n "$CURRENT_SECTION" ]
then
_build_section_end $CURRENT_SECTION
build_section_end $CURRENT_SECTION
x_off
fi
_build_section_start "[collapsed=true]" $*
build_section_start "[collapsed=true]" $*
x_restore
}
alias section_switch="x_off; _section_switch"
@@ -87,9 +88,10 @@ alias section_switch="x_off; _section_switch"
function _uncollapsed_section_switch {
if [ -n "$CURRENT_SECTION" ]
then
_build_section_end $CURRENT_SECTION
build_section_end $CURRENT_SECTION
x_off
fi
_build_section_start "" $*
build_section_start "" $*
x_restore
}
alias uncollapsed_section_switch="x_off; _uncollapsed_section_switch"
@@ -122,7 +124,8 @@ function error {
ENDCOLOR="\e[0m"
# we force the following to be not in a section
if [ -n "${CURRENT_SECTION:-}" ]; then
_section_end $CURRENT_SECTION
section_end $CURRENT_SECTION
x_off
fi
CURR_MINSEC=$(get_current_minsec)

View File

@@ -1194,7 +1194,7 @@
"description": "ci: use quiet alias for commands",
"nominated": true,
"nomination_type": 2,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "d69bd583655974922e965e76a8f703c67d661b17",
"notes": null