From 2c0ab5f8a1756c5a2c8d1e192dcd87da6c9dba48 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Thu, 18 Feb 2021 14:49:41 +0530 Subject: [PATCH] gitlab/cerbero: Don't fail when there's no macOS cache `test -d "${CERBERO_HOME}/dist/${ARCH}"` will cause the build to error out if the dist dir doesn't exist, which will happen if there's no cache, for example: https://gitlab.freedesktop.org/seungha.yang/gst-plugins-bad/-/jobs/7405565 What we actually want to do, is to not perform the rsync if there's no cache, since it means we want to rebuild from scratch; for instance, if the current MR uses a custom cerbero branch of the same name which won't have a prebuilt cache. Part-of: --- gitlab/cerbero_setup.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gitlab/cerbero_setup.sh b/gitlab/cerbero_setup.sh index 4fd7cea..fbf164f 100644 --- a/gitlab/cerbero_setup.sh +++ b/gitlab/cerbero_setup.sh @@ -126,8 +126,7 @@ cerbero_script() { $CERBERO $CERBERO_ARGS fetch-cache --branch "${GST_UPSTREAM_BRANCH}" - if [[ -n ${CERBERO_OVERRIDDEN_DIST_DIR} ]]; then - test -d "${CERBERO_HOME}/dist/${ARCH}" + if [[ -n ${CERBERO_OVERRIDDEN_DIST_DIR} && -d "${CERBERO_HOME}/dist/${ARCH}" ]]; then mkdir -p "${CERBERO_OVERRIDDEN_DIST_DIR}" time rsync -aH "${CERBERO_HOME}/dist/${ARCH}/" "${CERBERO_OVERRIDDEN_DIST_DIR}" fi -- 2.7.4