From 26a990454c958b0f9771b5c8392564734121e212 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Wed, 3 Feb 2021 14:05:19 +0530 Subject: [PATCH] gitlab: Allow du to fail in cerbero scripts It's purely for informative reasons. `du` will fail on the sources dir if a branch name has unicode in it due to an MSYS/MinGW bug. The long term fix is to from MSYS/MinGW to MSYS/MinGW-W64 or MSYS2/MinGW-W64. Part-of: --- gitlab/cerbero_setup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitlab/cerbero_setup.sh b/gitlab/cerbero_setup.sh index d752ce7..4fd7cea 100644 --- a/gitlab/cerbero_setup.sh +++ b/gitlab/cerbero_setup.sh @@ -96,7 +96,7 @@ cerbero_before_script() { if ! [[ -d ${CERBERO_SOURCES} ]]; then time cp -a "${CERBERO_HOST_DIR}/${CERBERO_SOURCES}" . fi - du -sch "${CERBERO_SOURCES}" + du -sch "${CERBERO_SOURCES}" || true echo "home_dir = \"$(pwd_native)/${CERBERO_HOME}\"" > localconf.cbc echo "local_sources = \"$(pwd_native)/${CERBERO_SOURCES}\"" >> localconf.cbc @@ -122,7 +122,7 @@ cerbero_script() { $CERBERO $CERBERO_ARGS show-config $CERBERO $CERBERO_ARGS fetch-bootstrap $CERBERO $CERBERO_ARGS fetch-package --deps gstreamer-1.0 - du -sch "${CERBERO_SOURCES}" + du -sch "${CERBERO_SOURCES}" || true $CERBERO $CERBERO_ARGS fetch-cache --branch "${GST_UPSTREAM_BRANCH}" -- 2.7.4