Commit 42696e16 authored by Nirbheek Chauhan's avatar Nirbheek Chauhan 🐜
Browse files

cerbero ci: Make before_script wiping more thorough

Will avoid packaging errors due to the old package file still being
around from a previous job, such as in:

https://gitlab.freedesktop.org/nirbheek/cerbero/-/jobs/4804147

Part-of: <!361>
parent a26129c7
......@@ -84,7 +84,7 @@ cerbero_package_and_check() {
cerbero_before_script() {
pwd
ls -lh
ls -lha
# Copy cerbero git repo stored on the image
cp -a "${CERBERO_HOST_DIR}/.git" .
......@@ -110,8 +110,10 @@ cerbero_before_script() {
time ./cerbero-uninstalled --self-update manifest.xml
# GitLab runner does not always wipe the image after each job, so do that
# to ensure we always have a clean builddir
time $CERBERO $CERBERO_ARGS wipe --keep-sources --build-tools --force
# to ensure we don't have any leftover data from a previous job such as
# 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}"
}
cerbero_script() {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment