ci: Fix FollowMerge monorepo src copy

nwut · Jan 15, 2024 · a6c6472 · a6c6472
1 parent b52aea4
commit a6c6472
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/.github/workflows/follow-merge-upstream-repo-sync.yml b/.github/workflows/follow-merge-upstream-repo-sync.yml
@@ -146,16 +146,16 @@ jobs:
           set -xeuo pipefail
           
           preserve_dir=$(mktemp -d)
-          if [ -n ${COPY_SRC_PRESERVE_PATH} ] && [ -d ${COPY_SRC_PRESERVE_PATH} ]; then
+          if [ -n "${COPY_SRC_PRESERVE_PATH}" ] && [ -d "${COPY_SRC_PRESERVE_PATH}" ]; then
             echo "Preserving ${COPY_SRC_PRESERVE_PATH}"
             cp -r "${COPY_SRC_PRESERVE_PATH}" "${preserve_dir}"
           fi 
 
-          rm -r "${COPY_SRC_PATH}"
+          rm -r "${COPY_SRC_PATH}" || true
           mkdir -p "${COPY_SRC_PATH}"
           cp -r tmp/src/* "${COPY_SRC_PATH}"
 
-          if [ -n ${COPY_SRC_PRESERVE_PATH} ]; then
+          if [ -n "${COPY_SRC_PRESERVE_PATH}" ]; then
             echo "Restoring preserved files"
             cp -rf ${preserve_dir}/* "${COPY_SRC_PATH}"
           fi