mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "cerbero: Never use cached cerbero git repo"

Browse source 
This reverts commit c3b5693736.

This broke the build and needs further investigation

https://gitlab.freedesktop.org/gstreamer/gst-ci/-/jobs/5630095
This commit is contained in:
Jordan Petridis 2020-11-16 15:40:16 +02:00
parent c3b5693736
commit 34dec61d86
No known key found for this signature in database
GPG key ID: 902CC06D159744F5
1 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gitlab/cerbero_setup.sh
View file

@ -86,15 +86,7 @@ cerbero_before_script() {
pwd pwd
ls -lha ls -lha
# Copy cerbero git repo stored on the image, delete an existing checkout if # Copy cerbero git repo stored on the image
# 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
cp -a "${CERBERO_HOST_DIR}/.git" . cp -a "${CERBERO_HOST_DIR}/.git" .
git checkout . git checkout .
git status git status
@ -122,9 +114,6 @@ cerbero_before_script() {
# a dirty builddir, or tarballs/pkg files, leftover files from an old # a dirty builddir, or tarballs/pkg files, leftover files from an old
# cerbero commit, etc. Skip the things we actually need to keep. # 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}" 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() { cerbero_script() {