Commit Graph

225 Commits

Author SHA1 Message Date
Kevin F. Haggerty
ee1036d3d8 build-webview: Update default webview to 113.0.5672.132
Change-Id: Iab9057e2b1c93454527f21feb52a40cf336f7fe7
2023-05-16 18:44:01 -06:00
Kevin F. Haggerty
c21ef2efb1 build-webview: Update default webview to 113.0.5672.77
Change-Id: I18f3b1ea23abe94636d2cfc00415a0a67282fa26
2023-05-07 23:38:33 +02:00
Michael Bestas
f6b08b9eed aosp-merger: Drop unused prev_* vars
Change-Id: I410868ca98efa96338b3e24478868a6386351283
2023-05-02 01:03:44 +03:00
Chirayu Desai
9ec0cacf39 pixel: Drop prev_build_id and prev_build_number
Change-Id: I8e4723e9cbd3c78c70785a5ed312edc93079dd44
2023-05-02 01:03:08 +03:00
Chirayu Desai
795e2a85dd pixel: Remove hardcoded version from get-new-devices.py
Change-Id: I03af5fc9f270cc9dd4f4183095173096fe33dbc0
2023-05-01 23:34:20 +03:00
Chirayu Desai
c32092b849 pixel: Always write full build desc and fingerprint
* Sometimes we may not have it set to prev build values,
  let's make sure we always write the correct value
  for the existing build

Change-Id: I266d9f2b4a940aac28c512d601dde6b3e24d6e08
2023-05-01 23:22:40 +03:00
Kevin F. Haggerty
d6af0478cb build-webview: Update default webview to 112.0.5615.136
Change-Id: Iefc3283d39449fac6275d5251d4e4ba187d8d602
2023-04-19 06:17:37 -06:00
Kevin F. Haggerty
461868b4bb build-webview: Update default webview to 112.0.5615.101
Change-Id: Ieb6da4e2792734147596e602e27104e651abfe67
2023-04-16 08:01:38 -06:00
Kevin F. Haggerty
cc6f2a9622 build-webview: Update default webview to 112.0.5615.48
Change-Id: I75be81dbfa85ee4ba5935d491d0979530aa6bd1d
2023-04-10 15:30:37 +02:00
LuK1337
ae15fafeb0 device-deps-regenerator: Don't rely on GitHub API
API is too rate limited for what we are trying to achieve.

Change-Id: I5e1c1870f635219ac32c4490a60ac4052fefddfa
2023-04-03 00:21:19 +02:00
LuK1337
073919298f device-deps-regenerator: Use f-strings everywhere
Change-Id: I1798f05ba258fd1cf32ccfa524ffcdc314d05595
2023-04-01 23:40:01 +02:00
LuK1337
89b4f27568 device-deps-regenerator: Remove unused commented out code
Change-Id: Icaa7d1c9ee56a172180e4ff53c487f52fd68870b
2023-04-01 23:30:34 +02:00
LuK1337
64a443d7ed device-deps-regenerator: Reformat with black
Change-Id: Ib17eee1dabda4cf126e5a4e6143c23d96d5c6042
2023-04-01 23:28:49 +02:00
Kevin F. Haggerty
1041ba523b build-webview: Update default webview to 111.0.5563.116
Change-Id: I40dc6ca8ceeae769b029847caa87e42860209efd
2023-03-30 14:40:10 +02:00
Michael W
5fdd957c8d emoji-updater: Apply found data to LatinIME
* Instead of having to sort the data manually, try finding
  the parts to be replaced automatically
* Print out whatever could not be applied in the same way
  as before

Change-Id: I297897cc934556a925dd1569a4c0f7bd95aed670
2023-03-29 00:22:28 +02:00
LuK1337
28aef9685b emoji-updater: Parse emoji-test.txt instead of full-emoji-list.html
Change-Id: I4744914e077cbe55110cd88b0657d94fd7c86afc
2023-03-29 00:22:28 +02:00
Michael Bestas
8b822e7e07 Remove manual Trebuchet merge instructions
It should work now with I4506226c530f5f84add3e5addfc14bcd43bf1f2a

Change-Id: I4e66fbef6e4d6e9bc3c759ed5412e8459cb15738
2023-03-28 21:13:20 +03:00
Michael Bestas
7b7ffd7ed1 aosp-merger: Support pushing merge instead of squash
Change-Id: If5e4ff6672828c9af464e001224b02cd2e35782d
2023-03-28 21:02:20 +03:00
Nolen Johnson
0e2addfede Document merger scripts and workflows
Change-Id: I0c1b87e2c835cb438b7df3d1b540a74fbb33c345
2023-03-28 21:02:08 +03:00
Chirayu Desai
642284106c aosp-merger: Run git diff with --no-ext-diff
* In case one is using an external diff program
  such as difftastic, this won't work as expected
* thread 'main' panicked at 'Hunk lines should be present in matched lines', /home/$USER/.cargo/registry/src/github.com-1ecc6299db9ec823/difftastic-0.37.0/src/display/hunks.rs:637:31
  note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
  fatal: external diff died, stopping at core/Makefile

Change-Id: Ie455016fa24b6e00ea021088cc5fc1e4bca3bf94
2023-03-21 04:59:43 +05:30
Michael Bestas
fb2f8aa34f aosp-merger: Rename some functions to match downstream scripts
Change-Id: I69eda606b12dc3965866ac28ce2037ed3f6b25a6
2023-03-21 04:59:43 +05:30
Michael Bestas
3b291f5436 aosp-merger: Remove double enter press
Change-Id: I2bdbcab5369692e338dbf7deea5276778993830f
2023-03-21 04:59:43 +05:30
Michael Bestas
ebc5674020 aosp-merger: Fix CLO branch detection in push-merge.sh
Change-Id: I9fd8ccbc4913732a652cb7005d6d5c34a1bd9395
2023-03-21 04:59:43 +05:30
Michael Bestas
61d10adbfb aosp-merger: Use full paths for kernel_repos
Change-Id: I12617ad5b93d8f3aae3c131e343588f368c22dd9
2023-03-21 04:59:43 +05:30
Michael Bestas
f4883e22ea aosp-merger: Use device_branch for pixel device/kernel merges
Change-Id: Ib3c0479fc753aeeccc13c5fbe8e80c5231cf1a19
2023-03-21 04:59:43 +05:30
Michael Bestas
ab49b1e556 aosp-merger: Move aospremote to merge helpers
This ensures aospremote always runs on device/kernel merge

Change-Id: I1cea400a1e22aea3c682765f1c6e09ba9263840d
2023-03-21 04:59:43 +05:30
Michael Bestas
68f947275c aosp-merger: Fix CLO merge/submit logic
Change-Id: I023edf71d6bc7e3b0717c20b96940dbdd0cb6c2c
2023-03-21 04:59:43 +05:30
Michael Bestas
2538c7d1f9 aosp-merger: s/lineageos_branch/os_branch/
Reduce the diff between CalyxOS/LineageOS scripts

Change-Id: I70e409e4bb050c4fd6b826912c7a9640c46ab9df
2023-03-21 04:59:43 +05:30
Michael Bestas
559a794b49 aosp-merger: s/LineageOS//
No need to brand simple console logs

Change-Id: Id2224ecc4b414919212328b2b25f0a7e3ccd4c6e
2023-03-21 04:59:43 +05:30
Michael Bestas
041e617cee aosp-merger: Merge clo tags independently
Read group from 2nd argument and merge the proper tag
instead of merging all at once.

Change-Id: Ie9bff27573cefdae7de29d906998e9eb4f662f3d
2023-03-21 04:59:43 +05:30
Michael Bestas
938454fa01 aosp-merger: Implement CLO merging
Change-Id: I57eeb68f1b8b1fc756ad665b790071d8872c4ebe
2023-03-21 04:59:43 +05:30
Michael Bestas
3c21ead826 aosp-merger: Allow using --new-tag as topic when uploading squash
Change-Id: I0b36d6e66ae94a82af8fbfe943563a2f083f564d
2023-03-21 04:59:43 +05:30
Michael Bestas
ffddfc9fd6 aosp-merger: Remove unused BRANCH from upload-squash
Change-Id: Ie744348a31eb159914b93ec4627be03bc7e1be34
2023-03-21 04:59:43 +05:30
Michael Bestas
cf357b2ac3 aosp-merger: Get the correct branch for squash/push from git
Change-Id: I54c3fe16b6c05c7b39ede9c4a4ef05f5b4f44e28
2023-03-21 04:59:43 +05:30
Michael Bestas
c5e5975dd1 aosp-merger: Allow merge without --old-tag set
Change-Id: I7ef5fde1a9f8b1706f21d2a8c0e1abfcff8bfba0
2023-03-21 04:59:43 +05:30
Michael Bestas
35c904f949 aosp-merger: Add some comments
Change-Id: Id5b8711981776edb169f5894c25b705e5bb9aa56
2023-03-21 04:59:43 +05:30
Michael Bestas
d9c87a53d5 aosp-merger: Abandon staging branch inside _merge_helper
Change-Id: Iea165da1de035cd4228ac28ce351ee3616c4e050
2023-03-21 04:59:43 +05:30
Michael Bestas
3b8c42073d aosp-merger: Always use upstream from .gitupstream when it exists
Change-Id: Ibcaa3b567964865f6cecb7058533ab2331be43d8
2023-03-21 04:59:43 +05:30
Michael Bestas
c44154f25c aosp-merger: Switch all scripts to argument parsing
Change-Id: I7af863d3952e7ae9de16860404bccd2b582caa20
2023-03-21 04:59:43 +05:30
Michael Bestas
f3b9352ed8 aosp-merger: Use merged_repos_${kernel}_kernel.txt for kernels
This prevents kernel merge overriding device merge which could
result in the wrong repository being pushed while running
`aosp-merger.sh submit-devices`

Change-Id: I89fccce5786ea0cbdd572ce1d3a2e9cac8ff91cd
2023-03-21 04:59:43 +05:30
Michael Bestas
a29949f546 aosp-merger: Implement subtree merge handling for pixels
Change-Id: Idbb5427497d5d04766f8a37e7fa6e1264458dd29
2023-03-21 04:59:43 +05:30
Chirayu Desai
d22bbbf6c5 aosp-merger: Implement kernel merging
Change-Id: I2dcc15ccf7d0a509880cd631435d1b8a1e07f5fb
2023-03-21 04:59:43 +05:30
Chirayu Desai
5a13bfe6df aosp-merger: Use pixels for device list
Change-Id: Ib9eb5ca0c600bc5e3c9272cf286581ad8d11cce8
2023-03-21 04:59:43 +05:30
Chirayu Desai
5ba12ef3e8 aosp-merger: Implement device merging
Change-Id: Ic8872d6acd1d291398dfa97ee2fb930d33b0fe75
2023-03-21 04:59:43 +05:30
Michael Bestas
1e5a9a85ca aosp-merger: Improve empty merge check
* Handles "Already up to date." merge being registered as "merge"
  instead of "nochange" in merged_repos.txt

Change-Id: I6e73013aa5c30a17f150a444b16365c39cf4280e
2023-03-21 04:59:43 +05:30
Michael Bestas
449925a802 aosp-merger: Force fetch AOSP tags
* There might be conflicting tags due to subtree use in device
  and kernel repositories, preventing the actual merge from happening.

Change-Id: I96d6421b2e8675fc898e28b57e2f948c9db2c27c
2023-03-21 04:59:43 +05:30
Michael Bestas
250233f538 aosp-merger: Don't run repohooks during repo upload
* These tend to fail on pure AOSP code, so just disable them
  for this script.

Change-Id: I3637f014ec38a365a2dbf07c61b39623599b6a9f
2023-03-21 04:59:43 +05:30
Michael Bestas
b92af37df1 aosp-merger: Adapt for LineageOS vars usage
Change-Id: Id63a7377ed68ee7d7743af31747eade2d785369e
2023-03-21 04:59:43 +05:30
Chirayu Desai
adcf6fca04 aosp-merger: Prepare for device merging
Change-Id: Ifcd99f733b3c7e2cc3969e10b7a7247ecbe34678
2023-03-21 04:59:43 +05:30
Chirayu Desai
dc1ae1fb35 aosp-merger: push-merge: Print filename of the merged_repos.txt we're handling
* Good to have this just before we print the branch name and tag being pushed

Change-Id: Ie45d4a9bcf65ec18972d58e7b748190759e1f0cd
2023-03-21 04:59:43 +05:30