mirror of
https://chromium.googlesource.com/crosvm/crosvm
synced 2025-02-06 02:25:23 +00:00
ca66addad0
We will be merging from the upstream repo into the cros repo. The script can be run from both an upstream and a cros checkout, it will setup the required remotes. The CLI changes a little. We now require a revision to merge from needs to be specified, since the script is not setting up the upstream remote. CI jobs will simply use HEAD, as the version to merge is already checked out by the CI system. BUG=b:233913643 TEST= ./merge_bot update-merges HEAD ./merge_bot update-merges origin/main ./merge_bot update-dry-runs HEAD Change-Id: I247e1edc3ad951becf5d59b63efd74914bb2205f Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3687222 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> |
||
|---|---|---|
| .. | ||
| windows | ||
| build-aarch64.sh | ||
| build-armhf.sh | ||
| build-chromeos.sh | ||
| build-merge-into-chromeos.sh | ||
| build-push-to-github.sh | ||
| build-x86_64.sh | ||
| common.cfg | ||
| common.sh | ||
| continuous-aarch64.cfg | ||
| continuous-armhf.cfg | ||
| continuous-chromeos.cfg | ||
| continuous-x86_64.cfg | ||
| merge-into-chromeos.cfg | ||
| presubmit-cq-aarch64.cfg | ||
| presubmit-cq-armhf.cfg | ||
| presubmit-cq-x86_64.cfg | ||
| presubmit-cr-aarch64.cfg | ||
| presubmit-cr-armhf.cfg | ||
| presubmit-cr-x86_64.cfg | ||
| push-to-github.cfg | ||
| simulate.py | ||