From f18de38a022d6194e83b4b4fc84bfb3eb8cff3e7 Mon Sep 17 00:00:00 2001 From: Dennis Kempin Date: Tue, 7 Dec 2021 12:55:45 -0800 Subject: [PATCH] kokoro: clean repo before merging There can be leftover files from a previous build. BUG=b:209034086 TEST=./ci/kokoro/simulate build-merge-into-chromeos.sh Change-Id: I0f7223bc6dd1769db04408f595764931c3ff2af8 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3321730 Reviewed-by: Daniel Verkamp Tested-by: Dennis Kempin --- ci/kokoro/build-merge-into-chromeos.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ci/kokoro/build-merge-into-chromeos.sh b/ci/kokoro/build-merge-into-chromeos.sh index 10e1564d3c..d492a562fc 100755 --- a/ci/kokoro/build-merge-into-chromeos.sh +++ b/ci/kokoro/build-merge-into-chromeos.sh @@ -57,6 +57,10 @@ main() { # create the merge. cp ./tools/chromeos/create_merge "${KOKORO_ARTIFACTS_DIR}/create_merge" + # Clean possible stray files from previous builds. + git clean -f -d -x + git checkout -f + # Perform merge on a tracking branch. git checkout -b chromeos origin/chromeos git branch --set-upstream-to origin/chromeos chromeos