Roll in gn binary from gn.googlesource.com by download_from_google_storage instead |
|||
Issue descriptionhttps://bugs.chromium.org/p/chromium/issues/detail?id=855791 didn't go too well. There were problems with the binaries themselves, and the cipd/DEPS issue, but the primary thing that broke was moving from buildtools to third_party/gn. In order to separate these two things that were attempted at the same time in bug 855791, I propose to do an uglier "roll" by locally downloading the cipd packages, uploading the gn binaries for each platform to the existing location in buildtools, and then rolling that into Chromium. This will let us see if there are any remaining problems with the binaries themselves, and once that's sorted out, we can must the strength of will to attempt the move the gn binary location (also, we can do that more incrementally, by adding probes to various locations that broke on the last attempt.)
,
Jun 28 2018
sgtm.
,
Jun 29 2018
Here's my super-awesome totally automatic manual roller. On a Linux box: scottmg@around:/work/tmp$ rm -rf .versions .cipd gn gn.exe scottmg@around:/work/tmp$ cipd install gn/gn/linux-amd64 git_revision:4cf8d1531a3980554937f96b50bf5db97aaf7925 Site root initialized at /work/tmp. Installing gn/gn/linux-amd64 (version "git_revision:4cf8d1531a3980554937f96b50bf5db97aaf7925")... [P150993 17:22:29.890 client.go:1291 I] cipd: resolving fetch URL for gn/gn/linux-amd64:73506bf1faedce5c38302538594fed3b1676e614 [P150993 17:22:29.979 storage.go:258 I] cipd: initiating the fetch [P150993 17:22:30.099 storage.go:225 I] cipd: about to fetch 1.0 MB [P150993 17:22:30.099 storage.go:216 I] cipd: fetching - 0% [P150993 17:22:30.147 storage.go:216 I] cipd: fetching - 100% [P150993 17:22:30.147 storage.go:216 I] cipd: fetching - 100% [P150993 17:22:30.147 client.go:1287 I] cipd: successfully fetched gn/gn/linux-amd64:73506bf1faedce5c38302538594fed3b1676e614 [P150993 17:22:30.148 deployer.go:168 I] Deploying gn/gn/linux-amd64:73506bf1faedce5c38302538594fed3b1676e614 into /work/tmp(/) [P150993 17:22:30.148 reader.go:307 I] cipd: about to extract 2.5 MB (3 files) [P150993 17:22:30.204 reader.go:346 I] cipd: extracting - 99% [P150993 17:22:30.204 reader.go:346 I] cipd: extracting - 100% [P150993 17:22:30.204 deployer.go:298 I] Successfully deployed gn/gn/linux-amd64:73506bf1faedce5c38302538594fed3b1676e614 Package gn/gn/linux-amd64 is now tracking "git_revision:4cf8d1531a3980554937f96b50bf5db97aaf7925". scottmg@around:/work/tmp$ sha1sum gn 57d96a3dc489ea38abf1d7acd466c82db1fac0a1 gn scottmg@around:/work/tmp$ gsutil cp gn gs://chromium-gn/57d96a3dc489ea38abf1d7acd466c82db1fac0a1 Copying file://gn [Content-Type=application/octet-stream]... - [1 files][ 2.4 MiB/ 2.4 MiB] Operation completed over 1 objects/2.4 MiB. scottmg@around:/work/tmp$ gsutil setmeta -h x-goog-meta-executable:1 gs://chromium-gn/57d96a3dc489ea38abf1d7acd466c82db1fac0a1 Setting metadata on gs://chromium-gn/57d96a3dc489ea38abf1d7acd466c82db1fac0a1... / [1 objects] Operation completed over 1 objects. scottmg@around:/work/tmp$ rm -rf .versions .cipd gn gn.exe scottmg@around:/work/tmp$ cipd install gn/gn/mac-amd64 git_revision:4cf8d1531a3980554937f96b50bf5db97aaf7925 Site root initialized at /work/tmp. Installing gn/gn/mac-amd64 (version "git_revision:4cf8d1531a3980554937f96b50bf5db97aaf7925")... [P151820 17:24:36.820 client.go:1291 I] cipd: resolving fetch URL for gn/gn/mac-amd64:14e2ac61ea9ce3d212338b8dc6fa5b871cc911b0 [P151820 17:24:37.054 storage.go:258 I] cipd: initiating the fetch [P151820 17:24:37.372 storage.go:225 I] cipd: about to fetch 0.7 MB [P151820 17:24:37.372 storage.go:216 I] cipd: fetching - 0% [P151820 17:24:37.402 storage.go:216 I] cipd: fetching - 100% [P151820 17:24:37.402 storage.go:216 I] cipd: fetching - 100% [P151820 17:24:37.402 client.go:1287 I] cipd: successfully fetched gn/gn/mac-amd64:14e2ac61ea9ce3d212338b8dc6fa5b871cc911b0 [P151820 17:24:37.402 deployer.go:168 I] Deploying gn/gn/mac-amd64:14e2ac61ea9ce3d212338b8dc6fa5b871cc911b0 into /work/tmp(/) [P151820 17:24:37.403 reader.go:307 I] cipd: about to extract 1.7 MB (3 files) [P151820 17:24:37.453 reader.go:346 I] cipd: extracting - 99% [P151820 17:24:37.453 reader.go:346 I] cipd: extracting - 100% [P151820 17:24:37.454 deployer.go:298 I] Successfully deployed gn/gn/mac-amd64:14e2ac61ea9ce3d212338b8dc6fa5b871cc911b0 Package gn/gn/mac-amd64 is now tracking "git_revision:4cf8d1531a3980554937f96b50bf5db97aaf7925". scottmg@around:/work/tmp$ sha1sum gn f08024240631f4974bb924b2f05712df185263ea gn scottmg@around:/work/tmp$ gsutil cp gn gs://chromium-gn/f08024240631f4974bb924b2f05712df185263ea Copying file://gn [Content-Type=application/octet-stream]... - [1 files][ 1.6 MiB/ 1.6 MiB] Operation completed over 1 objects/1.6 MiB. scottmg@around:/work/tmp$ gsutil setmeta -h x-goog-meta-executable:1 gs://chromium-gn/f08024240631f4974bb924b2f05712df185263ea Setting metadata on gs://chromium-gn/f08024240631f4974bb924b2f05712df185263ea... / [1 objects] Operation completed over 1 objects. scottmg@around:/work/tmp$ rm -rf .versions .cipd gn gn.exe scottmg@around:/work/tmp$ cipd install gn/gn/windows-amd64 git_revision:4cf8d1531a3980554937f96b50bf5db97aaf7925 Site root initialized at /work/tmp. Installing gn/gn/windows-amd64 (version "git_revision:4cf8d1531a3980554937f96b50bf5db97aaf7925")... [P152782 17:25:41.324 client.go:1291 I] cipd: resolving fetch URL for gn/gn/windows-amd64:52264eada9f6ed92a2acb1304d045b42f9cf3834 [P152782 17:25:41.428 storage.go:258 I] cipd: initiating the fetch [P152782 17:25:41.734 storage.go:225 I] cipd: about to fetch 1.0 MB [P152782 17:25:41.734 storage.go:216 I] cipd: fetching - 0% [P152782 17:25:41.768 storage.go:216 I] cipd: fetching - 100% [P152782 17:25:41.768 storage.go:216 I] cipd: fetching - 100% [P152782 17:25:41.768 client.go:1287 I] cipd: successfully fetched gn/gn/windows-amd64:52264eada9f6ed92a2acb1304d045b42f9cf3834 [P152782 17:25:41.769 deployer.go:168 I] Deploying gn/gn/windows-amd64:52264eada9f6ed92a2acb1304d045b42f9cf3834 into /work/tmp(/) [P152782 17:25:41.770 reader.go:307 I] cipd: about to extract 2.1 MB (3 files) [P152782 17:25:41.834 reader.go:346 I] cipd: extracting - 99% [P152782 17:25:41.834 reader.go:346 I] cipd: extracting - 100% [P152782 17:25:41.835 deployer.go:298 I] Successfully deployed gn/gn/windows-amd64:52264eada9f6ed92a2acb1304d045b42f9cf3834 Package gn/gn/windows-amd64 is now tracking "git_revision:4cf8d1531a3980554937f96b50bf5db97aaf7925". scottmg@around:/work/tmp$ ls -l total 2072 -r--r--r-- 1 scottmg primarygroup 2118144 Jun 28 17:25 gn.exe scottmg@around:/work/tmp$ sha1sum gn.exe a3f749800a386dba102a319b0e9770a3ca57650e gn.exe scottmg@around:/work/tmp$ gsutil cp gn.exe gs://chromium-gn/a3f749800a386dba102a319b0e9770a3ca57650e Copying file://gn.exe [Content-Type=application/x-msdos-program]... - [1 files][ 2.0 MiB/ 2.0 MiB] Operation completed over 1 objects/2.0 MiB. scottmg@around:/work/tmp$ gsutil setmeta -h x-goog-meta-executable:1 gs://chromium-gn/a3f749800a386dba102a319b0e9770a3ca57650e Setting metadata on gs://chromium-gn/a3f749800a386dba102a319b0e9770a3ca57650e... / [1 objects] Operation completed over 1 objects. Resulting in these 3 hashes for the .sha1 files: linux: 57d96a3dc489ea38abf1d7acd466c82db1fac0a1 mac: f08024240631f4974bb924b2f05712df185263ea win: a3f749800a386dba102a319b0e9770a3ca57650e
,
Jun 29 2018
The following revision refers to this bug: https://chromium.googlesource.com/chromium/buildtools/+/aec56e26079fba121e589006a88b7cbc1c398cfb commit aec56e26079fba121e589006a88b7cbc1c398cfb Author: Scott Graham <scottmg@chromium.org> Date: Fri Jun 29 00:32:02 2018 Roll to gn from gn.googlesource.com See linked bug for steps taken. Bug: 858852 Change-Id: I5fd8711be4a98426e508c6931b1b057973b320a8 [modify] https://crrev.com/aec56e26079fba121e589006a88b7cbc1c398cfb/linux64/gn.sha1 [modify] https://crrev.com/aec56e26079fba121e589006a88b7cbc1c398cfb/mac/gn.sha1 [modify] https://crrev.com/aec56e26079fba121e589006a88b7cbc1c398cfb/win/gn.exe.sha1
,
Jun 29 2018
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/f75b418b5679b9f8836ae7bad517dab3c20695ce commit f75b418b5679b9f8836ae7bad517dab3c20695ce Author: Scott Graham <scottmg@chromium.org> Date: Fri Jun 29 14:50:21 2018 Roll src/buildtools/ 9c9fd9792..aec56e260 (3 commits) https://chromium.googlesource.com/chromium/buildtools.git/+log/9c9fd97928dd..aec56e26079f $ git log 9c9fd9792..aec56e260 --date=short --no-merges --format='%ad %ae %s' 2018-06-28 scottmg Roll to gn from gn.googlesource.com 2018-06-27 scottmg Add gn-has-moved binary in old gn location 2018-06-26 scottmg Remove GN from buildtools Bug: 858852 , 855791 Change-Id: Iff22850633eac5a56540d261da6fd52c021e2ba4 Reviewed-on: https://chromium-review.googlesource.com/1119579 Reviewed-by: Dirk Pranke <dpranke@chromium.org> Commit-Queue: Scott Graham <scottmg@chromium.org> Cr-Commit-Position: refs/heads/master@{#571471} [modify] https://crrev.com/f75b418b5679b9f8836ae7bad517dab3c20695ce/DEPS
,
Jun 29 2018
The main Chromium tree and the semi-internal (?) ChromeOS builds seem OK. From what I can find, the Android and iOS internal ToT builders are OK, but I might not know all the places to look. Also, no one has mentioned anything broken yet (now ~3h after the buildtools roll landed).
,
Jun 29 2018
The following revision refers to this bug: https://chromium.googlesource.com/chromium/buildtools/+/66c7d9dc3c26e1a055db90b9a41af86b8dd071ba commit 66c7d9dc3c26e1a055db90b9a41af86b8dd071ba Author: Scott Graham <scottmg@chromium.org> Date: Fri Jun 29 19:43:57 2018 Re-add .gitignore for GN TBR: dpranke@chromium.org Bug: chromium:858852 , v8:7900 Change-Id: I9d9bfd3434e86bd33f7a271412fc99ec727d8598 [modify] https://crrev.com/66c7d9dc3c26e1a055db90b9a41af86b8dd071ba/.gitignore
,
Jun 29 2018
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/a506aa8d3863236856dfe09ae7da9a0062190cfd commit a506aa8d3863236856dfe09ae7da9a0062190cfd Author: Scott Graham <scottmg@chromium.org> Date: Fri Jun 29 21:10:50 2018 Roll src/buildtools/ aec56e260..0dd5c6f98 (3 commits) https://chromium.googlesource.com/chromium/buildtools.git/+log/aec56e26079f..0dd5c6f980d2 $ git log aec56e260..0dd5c6f98 --date=short --no-merges --format='%ad %ae %s' 2018-06-29 scottmg Revert "Remove libcpp_is_static" 2018-06-29 scottmg Re-add .gitignore for GN 2018-06-28 thomasanderson Remove libcpp_is_static Created with: roll-dep src/buildtools TBR: dpranke@chromium.org Bug: 858852 , v8:7900 Change-Id: Ie887a2a54932703505369516ca42bf44c19242db Reviewed-on: https://chromium-review.googlesource.com/1121046 Reviewed-by: Scott Graham <scottmg@chromium.org> Reviewed-by: Thomas Anderson <thomasanderson@chromium.org> Reviewed-by: Dirk Pranke <dpranke@chromium.org> Commit-Queue: Scott Graham <scottmg@chromium.org> Cr-Commit-Position: refs/heads/master@{#571628} [modify] https://crrev.com/a506aa8d3863236856dfe09ae7da9a0062190cfd/DEPS
,
Jul 2
,
Jul 2
Looks like this stuck. |
|||
►
Sign in to add a comment |
|||
Comment 1 by scottmg@chromium.org
, Jun 28 2018