mirror of
https://gitlab.gnome.org/GNOME/gimp.git
synced 2025-07-04 01:43:24 +00:00
gitlab: Refine meson-health failure catching
- Add backslash to avoid dots being treated as wildcards by grep - Do not allow search-common-ancestor to fail silently anymore
This commit is contained in:
parent
c6655c2eac
commit
f4b2c99a5d
2 changed files with 6 additions and 8 deletions
|
@ -8,7 +8,7 @@ diff=$(git diff -U0 --no-color "${newest_common_ancestor_sha}" -- '*.build' '*.p
|
||||||
#List of commonly used utilities on Unix world
|
#List of commonly used utilities on Unix world
|
||||||
#See the context: https://gitlab.gnome.org/GNOME/gimp/-/issues/11385
|
#See the context: https://gitlab.gnome.org/GNOME/gimp/-/issues/11385
|
||||||
coreutils_list="
|
coreutils_list="
|
||||||
.sh \
|
\.sh \
|
||||||
'sh' \
|
'sh' \
|
||||||
'bash' \
|
'bash' \
|
||||||
'\[' \
|
'\[' \
|
||||||
|
@ -128,7 +128,7 @@ coreutils_list="
|
||||||
|
|
||||||
for coreutil in $coreutils_list; do
|
for coreutil in $coreutils_list; do
|
||||||
if echo "$diff" | grep -q "$coreutil"; then
|
if echo "$diff" | grep -q "$coreutil"; then
|
||||||
found_coreutils="$found_coreutils $coreutil"
|
found_coreutils="$(echo "$found_coreutils $coreutil" | sed 's|\\||g')"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
@ -140,16 +140,16 @@ fi
|
||||||
|
|
||||||
#Limited list of commonly used utilities on Windows world
|
#Limited list of commonly used utilities on Windows world
|
||||||
ntutils_list="
|
ntutils_list="
|
||||||
.bat \
|
\.bat \
|
||||||
.cmd \
|
\.cmd \
|
||||||
.ps1 \
|
\.ps1 \
|
||||||
'cmd' \
|
'cmd' \
|
||||||
'powershell'
|
'powershell'
|
||||||
"
|
"
|
||||||
|
|
||||||
for ntutil in $ntutils_list; do
|
for ntutil in $ntutils_list; do
|
||||||
if echo "$diff" | grep -q "$ntutil"; then
|
if echo "$diff" | grep -q "$ntutil"; then
|
||||||
found_ntutils="$found_ntutils $ntutil"
|
found_ntutils="$(echo "$found_ntutils $ntutil" | sed 's|\\||g')"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
ancestor_horizon=28 # days (4 weeks)
|
ancestor_horizon=28 # days (4 weeks)
|
||||||
|
|
||||||
# We need to add a new remote for the upstream target branch, since this script
|
# We need to add a new remote for the upstream target branch, since this script
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue