From aa02efc39ead71faa6708e01eae24f445df672b2 Mon Sep 17 00:00:00 2001 From: Laurent Bonnans Date: Fri, 19 Jul 2019 11:06:52 +0200 Subject: Fix pre-clean of repo manifests Was causing problem with cache when updater-repo was updated Signed-off-by: Laurent Bonnans --- scripts/ci/checkout-oe.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/ci/checkout-oe.sh b/scripts/ci/checkout-oe.sh index 523d71c..fdc0e48 100755 --- a/scripts/ci/checkout-oe.sh +++ b/scripts/ci/checkout-oe.sh @@ -19,9 +19,11 @@ mkdir -p updater-repo cd updater-repo -repo init -m "${MANIFEST}.xml" -u "$REMOTE_SOURCE/updater-repo" +if [ -d .repo/manifests ]; then + git -C .repo/manifests reset --hard +fi -git -C .repo/manifests reset --hard +repo init -m "${MANIFEST}.xml" -u "$REMOTE_SOURCE/updater-repo" # patch manifest: # - add a new "ats" remote that points to "$REMOTE_SOURCE" -- cgit v1.2.3-54-g00ecf