fix: catalogus full clone (no sparse), fix manifest ver/status grep collision
This commit is contained in:
1 parent
981f5a5998
commit
a1ba13c1b5
1 file changed
+4
-4
@@ -112,14 +112,14 @@ jobs:
|
||||
if [ "${{ steps.check.outputs.cat_ref }}" != "$(cat "$S/ref" 2>/dev/null)" ]; then
|
||||
rm -rf "$WORK/src/catalogus"
|
||||
for attempt in 1 2 3; do
|
||||
if git clone --depth 1 --filter=blob:none --sparse \
|
||||
if git clone --depth 1 \
|
||||
https://gitlab.epicnabbo.nl/remco/Epicnabbo-Catalogus-Updated-Daily.git "$WORK/src/catalogus" 2>/dev/null; then
|
||||
break
|
||||
fi
|
||||
echo "Catalogus clone attempt $attempt failed, retrying..." >&2
|
||||
sleep 5
|
||||
done
|
||||
git -C "$WORK/src/catalogus" sparse-checkout set . 2>/dev/null || true
|
||||
[ -f "$WORK/src/catalogus/readme.md" ] || { echo "Catalogus clone failed"; exit 1; }
|
||||
echo "${{ steps.check.outputs.cat_ref }}" > "$S/ref"
|
||||
rm -rf "$S/snapshot"; cp -r "$WORK/src/catalogus" "$S/snapshot"
|
||||
else
|
||||
@@ -256,8 +256,8 @@ jobs:
|
||||
echo "|-----------|------|---------|--------|"
|
||||
for pair in "CMS:cms:cms" "Catalogus:catalogus:catalogus" "Nitro-V3:nitro:nitro" "Nitro-Render-V3:render:render" "Polaris Emulator:emulator:emulator"; do
|
||||
label="${pair%%:*}"; d="${pair#*:}"; key="${pair##*:}"
|
||||
ver="$(grep "^${key}:" "$WORK/components.txt" 2>/dev/null | head -1 | cut -d: -f2- | tr -d ' ')"
|
||||
st="$(grep "^${key}:" "$WORK/status.txt" 2>/dev/null | head -1 | cut -d: -f2- | tr -d ' ')"
|
||||
ver="$(grep -m1 "^${key}: " "$WORK/components.txt" 2>/dev/null | cut -d' ' -f2- | tr -d ' ')"
|
||||
st="$(grep -m1 "^${key}:" "$WORK/status.txt" 2>/dev/null | cut -d: -f2- | tr -d ' ')"
|
||||
[ -z "$st" ] && st="new"
|
||||
echo "| ${label} | ${d}/ | ${ver:-?} | ${st} |"
|
||||
done
|
||||
|
||||
Reference in new issue
Block a user