mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2025-02-06 02:25:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kokoro: clean repo before merging

Browse source 
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 <dverkamp@chromium.org>
Tested-by: Dennis Kempin <denniskempin@google.com>
This commit is contained in:
Dennis Kempin 2021-12-07 12:55:45 -08:00
parent fbb2de0188
commit f18de38a02
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ci/kokoro/build-merge-into-chromeos.sh
View file

@ -57,6 +57,10 @@ main() {
# create the merge. # create the merge.
cp ./tools/chromeos/create_merge "${KOKORO_ARTIFACTS_DIR}/create_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. # Perform merge on a tracking branch.
git checkout -b chromeos origin/chromeos git checkout -b chromeos origin/chromeos
git branch --set-upstream-to origin/chromeos chromeos git branch --set-upstream-to origin/chromeos chromeos