| commit | b3abc506133e83d3d9dc972d29710333a57a1fff | [log] [tgz] |
|---|---|---|
| author | Oliver Newman <olivernewman@fuchsia.infra.roller.google.com> | Wed Jun 18 13:48:46 2025 -0700 |
| committer | Copybara-Service <copybara-worker@google.com> | Wed Jun 18 13:51:35 2025 -0700 |
| tree | ef42f924df4fa7b97a46321024a0093e1ac8c0f6 | |
| parent | 75d14d35e06a48891b0c41745c3f34cee8c6415a [diff] |
[roll] Roll infra/recipes [cherry_pick] Use integration repo if remote matches This is a quick fix for failures like this: https://screenshot.googleplex.com/4KZyzSGkoffcojD That happens when trying to cherry-pick a smart-integration CL onto a non-"sd" branch, in this case "canary". We use the branch name to determine which integration repo to cherry-pick the change into, so if the branch name doesn't contain "sd" then we'll fall back to using GI, which is incorrect. As a workaround, use an integration repo for the checkout if it matches the remote of the incoming CL. This doesn't handle non-integration repos like smart.git, but cherry-picks in smart.git on non-milestone branches should be rare compared to cherry-picks in integration repos. Original-Reviewed-on: https://fuchsia-review.googlesource.com/c/infra/recipes/+/1304486 Original-Revision: 2c2c500c5ee3292e78f5ba980973be9bdb25a6d1 GitOrigin-RevId: 197ce2524d34214f0e861fbec7e2557a1ba1624b Change-Id: Ia161c8f1126bd1418fb5b751f2d6eaef85271c8d
This repository contains Fuchsia's Global Integration manifest files.
All changes should be made to the internal version of this repository. Our infrastructure automatically updates this version when the internal one changes.
Currently all changes must be made by a Google employee. Non-Google employees wishing to make a change can ask for assistance in one of the communication channels documented at get involved.
First install Jiri.
Next run:
$ jiri init $ jiri import minimal https://fuchsia.googlesource.com/integration $ jiri update
Third party projects should have their own subdirectory in ./third_party.