From: Jordan Petridis <jordan@centricular.com>
Date: Mon, 16 Nov 2020 13:40:16 +0000 (+0200)
Subject: Revert "cerbero: Never use cached cerbero git repo"
X-Git-Tag: 1.19.3~497^2~52
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=34dec61d8660fa4ecc0522416765d9ae805c786d;p=platform%2Fupstream%2Fgstreamer.git

Revert "cerbero: Never use cached cerbero git repo"

This reverts commit c3b5693736aea7798df87b10de48239ef7e43de7.

This broke the build and needs further investigation

https://gitlab.freedesktop.org/gstreamer/gst-ci/-/jobs/5630095
---

diff --git a/gitlab/cerbero_setup.sh b/gitlab/cerbero_setup.sh
index ce593b8..d752ce7 100644
--- a/gitlab/cerbero_setup.sh
+++ b/gitlab/cerbero_setup.sh
@@ -86,15 +86,7 @@ cerbero_before_script() {
     pwd
     ls -lha
 
-    # Copy cerbero git repo stored on the image, delete an existing checkout if
-    # it exists. Sometimes the git dir gets corrupted on the Windows runner,
-    # and there's no way to clean it up because gitlab will keep trying to
-    # reuse the cached image.
-    if ! [[ -d ${CERBERO_HOST_DIR}/.git ]]; then
-        mv "${CERBERO_HOST_DIR}/.git" "${CERBERO_HOST_DIR}/.git-old"
-        # rm -rf is very slow on Windows, so do it in the background
-        rm -rf "${CERBERO_HOST_DIR}/.git-old" &
-    fi
+    # Copy cerbero git repo stored on the image
     cp -a "${CERBERO_HOST_DIR}/.git" .
     git checkout .
     git status
@@ -122,9 +114,6 @@ cerbero_before_script() {
     # a dirty builddir, or tarballs/pkg files, leftover files from an old
     # cerbero commit, etc. Skip the things we actually need to keep.
     time git clean -xdff -e cerbero_setup.sh -e manifest.xml -e localconf.cbc -e "${CERBERO_SOURCES}"
-
-    # Wait for the rm -rf from above if needed
-    [[ -n $(jobs -p) ]] && fg
 }
 
 cerbero_script() {