Skip to content

Commit 78243d7

Browse files
committed
CI: Handle possible error condition in gersemi branch of format script
1 parent ab01c40 commit 78243d7

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

build-aux/.run-format.zsh

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ invoke_formatter() {
9696
if (( ${+commands[gersemi]} )) {
9797
local gersemi_version=($(gersemi --version))
9898

99-
if ! is-at-least 0.12.0 ${gersemi_version[2]}; then
100-
log_error "gersemi is not version 0.12.0 or above (found ${gersemi_version[2]}."
99+
if ! is-at-least 0.21.0 ${gersemi_version[2]}; then
100+
log_error "gersemi is not version 0.21.0 or above (found ${gersemi_version[2]}."
101101
exit 2
102102
fi
103103
}
@@ -116,9 +116,13 @@ invoke_formatter() {
116116
if (( ${#source_files} )) {
117117
while read -r line; do
118118
local -a line_tokens=(${(z)line})
119-
file=${line_tokens[1]//*obs-studio\//}
119+
if (( #line_tokens )) {
120+
file=${line_tokens[1]//*${project_root}\//}
120121

121-
log_error "${file} requires formatting changes."
122+
log_error "${file} requires formatting changes."
123+
} else {
124+
log_error "${line}"
125+
}
122126

123127
if (( fail_on_error == 2 )) return 2
124128
num_failures=$(( num_failures + 1 ))
@@ -205,6 +209,7 @@ invoke_formatter() {
205209
run_format() {
206210
if (( ! ${+SCRIPT_HOME} )) typeset -g SCRIPT_HOME=${ZSH_ARGZERO:A:h}
207211
if (( ! ${+FORMATTER_NAME} )) typeset -g FORMATTER_NAME=${${(s:-:)ZSH_ARGZERO:t:r}[2]}
212+
local project_root=${SCRIPT_HOME:A:h}
208213

209214
typeset -g host_os=${${(L)$(uname -s)}//darwin/macos}
210215
local -i fail_on_error=0

0 commit comments

Comments
 (0)