Google Git
Sign in
fuchsia/integration/d0820aa98f3b326bd3ba60237a4ec013e06b032e
commit
d0820aa98f3b326bd3ba60237a4ec013e06b032e
[log]
author
Gabe Schine <thatguy@fuchsia.infra.roller.google.com>
Tue Jun 13 19:30:07 2023 +0000
committer
Copybara-Service <copybara-worker@google.com>
Tue Jun 13 12:33:01 2023 -0700
tree
1e029b70ef0affd8c1a2a747f1006462c995b477
parent
4a611e5c1a94b2781b6881fed2bf75c2f6f22a32 [diff]
[roll] Roll fuchsia [cmc] Teach `cmc merge` to handle CML files from GN metadata.

Also:
* Remove legacy naive JSON merging.

Original-Fixed: 127380
Original-Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/868319
Original-Revision: a41d493b533e7d838f21b1eb9a83653a0b29e7f1
GitOrigin-RevId: d59b7213d0eb4b2802788aa9250e19b96ad395f1
Change-Id: I364607cd122a5e8a35a1e27b008c429533829c5d
1 file changed
tree: 1e029b70ef0affd8c1a2a747f1006462c995b477
  1. git-hooks/
  2. infra/
  3. third_party/
  4. cts
  5. firmware
  6. flower
  7. jiri.lock
  8. MILESTONE
  9. minimal
  10. prebuilts
  11. README.md
  12. stem
  13. test_durations
  14. toolchain
README.md

Integration

This repository contains Fuchsia's Global Integration manifest files.

Making changes

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 via the IRC channel #fuchsia on Freenode.

Obtaining the source

First install Jiri.

Next run:

$ jiri init
$ jiri import minimal https://fuchsia.googlesource.com/integration
$ jiri update

Third party

Third party projects should have their own subdirectory in ./third_party.