aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-05-12Support fetching from an upstream main git branch am: c0d933345f am: ↵android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devJoel Galenson
797a4508bf am: 79148026df Original change: https://android-review.googlesource.com/c/platform/tools/external_updater/+/1705651 Change-Id: I632260b7cb7b5fdcf5c2fd6655ec2c9ef378a2de
2021-05-12Support fetching from an upstream main git branch am: c0d933345f am: 797a4508bfJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/tools/external_updater/+/1705651 Change-Id: I40eadbdce46df7c2984d4f14b0c84550db1085ac
2021-05-12Support fetching from an upstream main git branch am: c0d933345fJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/tools/external_updater/+/1705651 Change-Id: Ia270236a8ab549d1a2f59846688624cf29d549e9
2021-05-12Support fetching from an upstream main git branchandroid-s-beta-2android-s-beta-1Joel Galenson
The external updater currently assumes the name of the upstream git branch to fetch is always "master". This is no longer true, as some repositories use "main" instead. This commit lets the updater try to use both of those branches. Note that there are still a few instances of "master" in the updater, but I believe those correspond to AOSP and GitHub specifically and so shouldn't need to be changed yet. If/when they do, we should be able to change them easily with these changes. As part of this change we also fix a potential bug in a previously-unused function so that it does not strip part of the branch name from a string of the form "<remote name>/<branch name>". Test: Run the updater with upstream master and upstream main. Change-Id: I0cf83dbf1765ff26b602176fa1c1ff95224e1a7f
2021-05-07Merge "Use a wrapper around cargo2android.py." am: 08af5ca7e7 am: 7a83523dc8 ↵Joel Galenson
am: ae734788fe Original change: https://android-review.googlesource.com/c/platform/tools/external_updater/+/1698941 Change-Id: I61f9c93cc24e076f15647ffedb6ed0a22d7b1ea2
2021-05-07Merge "Use a wrapper around cargo2android.py." am: 08af5ca7e7 am: 7a83523dc8Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/tools/external_updater/+/1698941 Change-Id: Ic800ab1f79c35759e2889e22b0a0a4ad2abea43f
2021-05-07Merge "Use a wrapper around cargo2android.py." am: 08af5ca7e7Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/tools/external_updater/+/1698941 Change-Id: I38143b5189a83cec495faf13ad3540f8b3ae27ed
2021-05-07Merge "Use a wrapper around cargo2android.py."Joel Galenson
2021-05-06Use a wrapper around cargo2android.py.Joel Galenson
Fixes: 181953883 Test: Run the updater. Change-Id: I4cf771d691094823c42b52e18369bdcc082f72a9
2021-05-05Merge "Reduce randomness in test" am: d6ac467df8 am: 8c8899b9c2 am: 0c0e5ef014Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/tools/external_updater/+/1697310 Change-Id: I8b797839a2d724e57ec96cae78fff19b403c5a78
2021-05-05Merge "Reduce randomness in test" am: d6ac467df8 am: 8c8899b9c2Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/tools/external_updater/+/1697310 Change-Id: I97fc4ccbdea0260b9515a883f7b17bfbdd2ed063
2021-05-05Merge "Reduce randomness in test" am: d6ac467df8Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/tools/external_updater/+/1697310 Change-Id: I3d82f2e9cfcf05c4bcf55f897e448a475ca38a84
2021-05-05Merge "Reduce randomness in test"Treehugger Robot
2021-05-05Reduce randomness in testJoel Galenson
Reduce the amount of randomness required by a reviewer test, which should reduce its (already pretty rare) flakes by over an order of magnitude. Bug: 187300473 Test: atest Change-Id: Id1b9e35e3ad40861e83b91f2d60555a0528335e1
2021-04-30Let the updater work with cargo2android config files. am: f77743d9aa am: ↵Joel Galenson
2f8748d06b am: 86cc84dc16 Original change: https://android-review.googlesource.com/c/platform/tools/external_updater/+/1691549 Change-Id: I04fd4221dc3cb509511d4f67ce8f3d1cdf448009
2021-04-30Let the updater work with cargo2android config files. am: f77743d9aa am: ↵Joel Galenson
2f8748d06b Original change: https://android-review.googlesource.com/c/platform/tools/external_updater/+/1691549 Change-Id: Ic03a53daec639c75d8d67a4a8101565bf1b5673d
2021-04-30Let the updater work with cargo2android config files. am: f77743d9aaJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/tools/external_updater/+/1691549 Change-Id: Ia148e35d83fd009c006c52f0c111dc084ae658cd
2021-04-29Let the updater work with cargo2android config files.Joel Galenson
Test: Run updater Change-Id: Iae3bbed86f96765e683c5a3916f0237349d58a0a
2021-04-08Merge "Do not create backup files when patching." am: df0d4c675d am: ↵Treehugger Robot
f9c873084b am: 958bfd1630 Original change: https://android-review.googlesource.com/c/platform/tools/external_updater/+/1670125 Change-Id: I4d4c5e8c85a25ad3dce24f3b19936e16354a421a
2021-04-08Merge "Do not create backup files when patching." am: df0d4c675d am: f9c873084bTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/tools/external_updater/+/1670125 Change-Id: Ie54ecc1700c0181b4849ff6479ab87da75b9f425
2021-04-08Merge "Fixes for upgrading Rust crates" am: 7f57890e45 am: c4722aec2f am: ↵Treehugger Robot
bccbec3a6a Original change: https://android-review.googlesource.com/c/platform/tools/external_updater/+/1664157 Change-Id: I3f60ae80a6aa9a3363d46026a68199515bdf2b20
2021-04-08Merge "Do not create backup files when patching." am: df0d4c675dTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/tools/external_updater/+/1670125 Change-Id: Idc8398b21604cd82a08760f47c1ca0d2fd1256fa
2021-04-08Merge "Fixes for upgrading Rust crates" am: 7f57890e45 am: c4722aec2fTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/tools/external_updater/+/1664157 Change-Id: I25029f1d168e9af969e915a8fff025f9977d07bd
2021-04-08Merge "Do not create backup files when patching."Treehugger Robot
2021-04-08Merge "Fixes for upgrading Rust crates" am: 7f57890e45Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/tools/external_updater/+/1664157 Change-Id: Ia4deaf5d498657dbbfbe9ee8fa7f4c11dd5b5401
2021-04-08Merge "Fixes for upgrading Rust crates"Treehugger Robot
2021-04-08Do not create backup files when patching.Joel Galenson
When patching a file, if the patch succeeds with an offset, patch will create a .orig patch file. We will then later git add that file and upload it, which is unnecessary. Let's tell patch not to create backup files. Test: Upgrade a package that succeeds with an offset. Change-Id: Ie3e2423340c6281aefbc06c424fbe1cfbdcfdf54
2021-04-08Mark CLs as Verified-1 if they have errors. am: 58eeae7363 am: d808ac926a ↵Joel Galenson
am: d4698807a8 Original change: https://android-review.googlesource.com/c/platform/tools/external_updater/+/1667667 Change-Id: Ic4d1844a269595faa32da057c587be8133450d6a
2021-04-08Mark CLs as Verified-1 if they have errors. am: 58eeae7363 am: d808ac926aJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/tools/external_updater/+/1667667 Change-Id: I4ff6025c892a9f483c19538d9e179ce675e48616
2021-04-07Mark CLs as Verified-1 if they have errors. am: 58eeae7363Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/tools/external_updater/+/1667667 Change-Id: If467f919cddd8ad608348189515bb8269f75938d
2021-04-07Mark CLs as Verified-1 if they have errors.Joel Galenson
We currently upload CLs that can be broken. This is potentially fine, as it's a signal to the reviewer that an upgrade needs work. But we should mark them as failing in some way to give the reviewer that hint. This CL does that by setting Verified-1. We currently only implement it for Rust crates. Rather than modifying the existing mechanisms to detect various errors (which seems difficult e.g., in the case of patches) we do checks for errors after the fact. We currently check for .rej files (meaning failed patches) and errors in Android.bp. These checks are both heuristics and so could fail (in either way). Test: Created aosp/1665704, aosp/1667706, aosp/1667707 Change-Id: I7e148d4d0cc5c1f2434cfdb98a969e7969a3893a
2021-04-05Fixes for upgrading Rust cratesJoel Galenson
Fix three issues that came up when upgrading crates. First, allow naming patches .patch and not just .diff. Second, do not apply Rust patches for Android.bp files. cargo2android.py will apply those, and if we also try to do so we will fail. Third, re-regenerate Android.bp after applying local patches for Rust projects. In some cases the patches can delete files that are used in Android.bp (e.g., tests). Without this, the generated Android.bp can rely on files that do not exist and thus fail. Test: Upgrade some crates Change-Id: I372a3f8597d49d44d711b68cc3b610941cabcab1
2021-03-24migrate external_updater_reviewers_test out of test mapping am: 95dcb86011 ↵Julien Desprez
am: 992d5705b1 am: 54a67e8bfd Original change: https://android-review.googlesource.com/c/platform/tools/external_updater/+/1647028 Change-Id: Id485e27b9146c5ee7ec018850220984a483f6eb8
2021-03-24migrate external_updater_reviewers_test out of test mapping am: 95dcb86011 ↵Julien Desprez
am: 992d5705b1 Original change: https://android-review.googlesource.com/c/platform/tools/external_updater/+/1647028 Change-Id: I9dbd2d473c4ebcbd8895ce8eed0eadde575bc32e
2021-03-24migrate external_updater_reviewers_test out of test mapping am: 95dcb86011Julien Desprez
Original change: https://android-review.googlesource.com/c/platform/tools/external_updater/+/1647028 Change-Id: If56e90050402b4e8ddd4e05959299e943dfedec5
2021-03-19migrate external_updater_reviewers_test out of test mappingJulien Desprez
unit tests setup do not require an explicit test mapping config (go/a-unit-tests) Change-Id: I54ef7c33f4e06c4d05ccfc17169db9ba3cf3c4dc Test: presubmit Bug: 183209529 Bug: 183218558
2021-03-20Use embedded launcher for external_updater test am: d7d89cc013 am: ↵Haibo Huang
a89132cfe4 am: bea23f6ddb Original change: https://android-review.googlesource.com/c/platform/tools/external_updater/+/1646740 Change-Id: I969f6971073db2333702631d30c8da3ee00880f1
2021-03-20Use embedded launcher for external_updater test am: d7d89cc013 am: a89132cfe4Haibo Huang
Original change: https://android-review.googlesource.com/c/platform/tools/external_updater/+/1646740 Change-Id: I647990229519835ec0f3c59a383d5bc98757b6b1
2021-03-19Use embedded launcher for external_updater test am: d7d89cc013Haibo Huang
Original change: https://android-review.googlesource.com/c/platform/tools/external_updater/+/1646740 Change-Id: I225b34061023b1d60725b3dd5fc492ef40911a31
2021-03-19Use embedded launcher for external_updater testHaibo Huang
We had this before embedded python3 is available. When embedded_launcher is false, host python3 will be used. We probably should enable embedded launcher for everything, but I got the following error when I did so. <urlopen error [SSL: CERTIFICATE_VERIFY_FAILED] certificate verify failed: unable to get local issuer certificate (_ssl.c:1123)> Bug: 183218558 Change-Id: I3a0e343c10411861aed8acfca4768af2a1ef8685
2021-02-22[external_updater] cc owners am: a1c747bea0 am: 4bb88d5422 am: 9b821fe429Haibo Huang
Original change: https://android-review.googlesource.com/c/platform/tools/external_updater/+/1599461 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8860398cf905d800cfb8fbdc1a7dd0e6097ed6c7
2021-02-22[external_updater] Do not try to delete tmp_auto_upgrade branch am: ↵Haibo Huang
9c46f2990c am: f8c9141b83 am: 674a82b9bd Original change: https://android-review.googlesource.com/c/platform/tools/external_updater/+/1599458 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I41f98ea597d8c9a7a2bca1fe2a5e1e138b56c89c
2021-02-22[external_updater] cc owners am: a1c747bea0 am: 4bb88d5422Haibo Huang
Original change: https://android-review.googlesource.com/c/platform/tools/external_updater/+/1599461 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic19e636281cf57a9a4b1f9ff2a24a7080dbdb9d7
2021-02-22[external_updater] Do not try to delete tmp_auto_upgrade branch am: ↵Haibo Huang
9c46f2990c am: f8c9141b83 Original change: https://android-review.googlesource.com/c/platform/tools/external_updater/+/1599458 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3313b78c6496c0f7e93bc759430115a501484312
2021-02-22[external_updater] cc owners am: a1c747bea0Haibo Huang
Original change: https://android-review.googlesource.com/c/platform/tools/external_updater/+/1599461 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4da81f9f685eeddce79cad29148ef604608317e5
2021-02-22[external_updater] Do not try to delete tmp_auto_upgrade branch am: 9c46f2990cHaibo Huang
Original change: https://android-review.googlesource.com/c/platform/tools/external_updater/+/1599458 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia8a6f8c60a0f69c67560d4c7c861db88b4c7c096
2021-02-22[external_updater] cc ownersHaibo Huang
Bug: 171974932 Change-Id: I23d28163914e8cd04b77175350ab8b4beadafdd9
2021-02-22[external_updater] Do not try to delete tmp_auto_upgrade branchHaibo Huang
This branch should already be removed before the script starts. This can reduce one error message. Change-Id: I1541de7933a129d0fd0af6fe4a88722aef8dce73
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d9dee2d08d -s ↵Xin Li
ours am: 8b0ea4a73b -s ours am skip reason: Change-Id Ie6a12cc50ad0e253cc1979c56924595f299a1dd5 with SHA-1 aceb15d32a is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie26916378ef254c1cd2cd293f4e21881c01e8c06
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d9dee2d08d -s oursXin Li
am skip reason: Change-Id Ie6a12cc50ad0e253cc1979c56924595f299a1dd5 with SHA-1 aceb15d32a is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icd6dfb536b8463ec5b26a4486b1c09ce950d8510
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 20:52:37 +0000