Commit Graph

225 Commits

Author SHA1 Message Date
Chirayu Desai
f1363b6619 aosp-merger: remove merged_repos.txt early
* To be able to re-run the script cleanly

Change-Id: I7eb65bc5d7265d0b4d892cb5c2921a8bec02103c
2023-03-21 04:59:43 +05:30
Chirayu Desai
8beaa422b3 aosp-merger: upload-squash: Use topic from a var
* For consistency, since there can be multiple tags for a month

Change-Id: I077649c2bc90613b6543187c969165d076f44b86
2023-03-21 04:59:43 +05:30
Michael Bestas
44bbda6481 aosp-merger: Export LC_MESSAGES=C LC_TIME=C
* Ensure system locale doesn't affect git commit messages

Change-Id: I2bb458cd57efb7a9a41f08f1fc8beeb832789c79
2023-03-21 04:59:43 +05:30
Michael Bestas
788196f219 aosp-merger: Fix merged_repos.txt handling after refactor
Change-Id: I8719e4ab8ddd043eefc1e0c1dca9d427b0f0cc7e
2023-03-21 04:59:43 +05:30
Michael Bestas
6fb4c9a940 aosp-merger: allow running from any directory
Change-Id: I14907315ed2e9fcbc3db7bcb0a74e3d5e00c68c8
2023-03-21 04:59:43 +05:30
Michael Bestas
f5199e1afa aosp-merger: Add script that merges non-forked repositories
* Useful to find differences and potential missing commits
  between AOSP tags with different ancestor on repositories
  that we have not forked.

  One example is this month, switching from Pixel 6
  December 2021 tag to qcom Pixel January 2022 tag.

Change-Id: Ib5bafd50c20375368255ad9bbb8ca702c3361652
2023-03-21 04:59:43 +05:30
Michael Bestas
e736c1d62e aosp-merger: Add script that pushes the merge to refs/heads
Change-Id: I6d263d8ccc6fc6854b8e9d7301e556b15987a2e7
2023-03-21 04:59:43 +05:30
Michael Bestas
ecb72f12b5 aosp-merger: Add script that pushes squashed merge to gerrit
Change-Id: I17ca8ca1a18a2c74d2e595d2bb34c231a403dc04
2023-03-21 04:59:43 +05:30
Michael Bestas
172a9f5847 aosp-merger: Skip empty merges
* Sometimes we get empty merges caused by AOSP internal
  branch merges. Let's just skip those.

Change-Id: I5a13e8e53af38fe1cb9da4b18a13b88682cb4758
2023-03-21 04:59:42 +05:30
Michael Bestas
b6e3069d94 aosp-merger: Never use git reset --hard ${NEWTAG}
* This makes repositories end up with inconsistent
  git history, requiring force push at some cases.
  Just merge normally, if there are no changes we
  are going to handle it in a cleaner way.

Change-Id: Ida69e91c1881c52dc6d805a07d870d9fe26d6279
2023-03-21 04:59:42 +05:30
Michael Bestas
1284df7391 aosp-merger: Abandon staging branch if there were no changes
Change-Id: Ia1a526bf6df0c457b30739be58962da7ac2bde78
2023-03-21 04:59:42 +05:30
Chirayu Desai
e83beff143 aosp-merger: Improve merge commit message
* Merge and commit separately,
  to get newline between commit content and Change-Id
* Install prepare-commit-msg git hook, for nicer conflict messages
  https://gist.github.com/mikeNG/e55ef8e7a1e5cd596a950386503054fd/

Change-Id: I97370b352ccf4f146b4b6ea89af75e032fb13730
2023-03-21 04:59:42 +05:30
Chirayu Desai
134fd8ad0a aosp-merger: Add a tiny script that does the merging based on variables
Change-Id: I58bb25255293495bcb07667da1769f47640fdf4b
2023-03-21 04:59:42 +05:30
Michael Bestas
551da8082b aosp-merger: Rename aosp-merger.sh to merge-aosp-forks.sh
* In preperation for the upcoming script changes

Change-Id: If963ca2f8af703655963e7f5d3ab56484270b358
2023-03-21 04:59:42 +05:30
Chirayu Desai
b6a649c37b aosp-merger: Split out the for loop guts to _merge_helper.sh
* This script can be used by other callers to merge individual repos
* Get branch name from our variables
* Don't repo sync -d, it removes any local changes we made to merge
  scripts. Let's just manually sync before running this script.

Change-Id: I7ddfbfd934908e4a72fc2742753b4c704fa6c5e3
2023-03-21 04:59:42 +05:30
Michael Bestas
d10751ac91 aosp-merger: Switch to SPDX copyright header
* Less clutter

Change-Id: Ib8496ec5d02521ce76a886fb0b48133d57a6f707
2023-03-21 04:59:42 +05:30
Chirayu Desai
68d049c830 aosp-merger: Do not force-fully rebasing
* I know what I'm doing, when I say merge, I want to merge,
  whether there's common ancestry or not!

Change-Id: I75bd3818b93d33a878de53f5cdd38c138ba690c8
2023-03-21 04:59:42 +05:30
Chirayu Desai
c5e7492b3b aosp-merger: Add script to squash changes for review
Change-Id: I1ffc3678fa40938bae62d5112c8fcacbffab4651
2023-03-21 04:59:42 +05:30
Kevin F. Haggerty
e8d7eb5d87 build-webview: Update default webview to 111.0.5563.58
Change-Id: I57944960cc2f459c43822e8966547b0a7031defd
2023-03-09 01:26:28 -07:00
Michael Bestas
3508ae059c device-deps-regenerator: blacklist -> ignorelist
Change-Id: I5644c9fd450012d7de1ead4411b43494dc666f83
2023-02-13 23:13:30 +01:00
Michael Bestas
212e53c9c7 device-deps-regenerator: Add gs201 common device repos to blacklist
Change-Id: Ib589b5b66918c5cc6c9eae61e003aac83025d7a0
2023-02-13 23:13:30 +01:00
Michael Bestas
636fead761 device-deps-regenerator: Handle deps set in _hardware_ repos
Example: hardware/motorola depends on system/qcom

Change-Id: I996d9b89dca777cb83de6ec07075ab9454290016
2023-02-13 23:13:30 +01:00
Michael Bestas
d8eb1bc082 device-deps-regenerator: Remove cm.dependencies support
It hasn't been supported since 15.0

Change-Id: Ibdefe8b1608d3481840ae7e00c05d9fcbf3a5760
2023-02-13 23:13:30 +01:00
Michael Bestas
b35a287a40 device-deps-regenerator: Add 20 branches
Change-Id: If8202572bf97a071cdf7335ccd35fb429f0a6957
2023-02-13 23:13:30 +01:00
Kevin F. Haggerty
6b39f43910 build-webview: Update default webview to 109.0.5414.118
Change-Id: I5b699faf4d0de0276c19a803166ee67d5b1318df
2023-01-27 08:16:06 -07:00
Chirayu Desai
aacffc67d6 update-device-vars: Add a sleep to avoid 429: Too Many Requests
Change-Id: Ib4a382cb4b1af025b401e54b07d69414c419f4cf
2023-01-04 02:05:02 +02:00
Timi Rautamäki
349e17ad16 best-caf-kernel: return 0 if no tags are found
* ´git tag -l <tag>´ returns "" if no tags are found

Change-Id: Ia79db1c8978579efe56de26968124888463ae7ca
2022-12-22 17:45:44 +01:00
Kevin F. Haggerty
dcfc98e109 build-webview: Update default webview to 108.0.5359.128
Change-Id: I98c58fe642f6e5a683c6aae41a1d1292c28759bb
2022-12-14 07:03:38 -07:00
Kevin F. Haggerty
45d62060bf build-webview: Update default webview to 108.0.5359.79
Change-Id: I1a30b034b3b6335ca1efb9074afde205a2f97a5d
2022-12-06 16:35:14 +01:00
Michael Bestas
6425bee35f best-caf-kernel: Fix crash when there are no lines changed
Change-Id: I6d0539f8b2d07e25fc92937d280f4255a7800d71
2022-11-19 00:17:09 +02:00
Kevin F. Haggerty
19fdf91811 build-webview: Update default webview to 107.0.5304.105
Change-Id: I7259e4dabbc48dbd8a721698cfb057ccc04c491e
2022-11-10 17:23:53 -07:00
Kevin F. Haggerty
4190771b09 build-webview: Update default webview to 107.0.5304.91
Change-Id: If5d06c1cee0be219e6b4bbf7fe513fe426d60c91
2022-10-27 21:40:08 -06:00
Kevin F. Haggerty
1534553594 build-webview: Update default webview to 106.0.5249.126
Change-Id: I2a32b489ebc67210777d708bd921d90b4287ed93
2022-10-14 20:20:38 -06:00
Kevin F. Haggerty
73abecb081 build-webview: Update default webview to 106.0.5249.79
Change-Id: I91ed477d4630c09b613e60127bf3038b59445a0f
2022-10-01 07:48:12 -06:00
Kevin F. Haggerty
494cb7d950 build-webview: Update default webview to 105.0.5195.136
Change-Id: Iebb14bcbb1adfc512d270ed8ad54e12d39e66a99
2022-09-14 17:01:17 -06:00
Kevin F. Haggerty
cdd31e02ac build-webview: Update default webview to 105.0.5195.79
Change-Id: Ic7bc168ca1365b60f3866922ca4e65c452d40595
2022-09-06 16:58:59 -06:00
Kevin F. Haggerty
1c294c64a7 build-webview: Update default webview to 105.0.5195.68
Change-Id: I5fe6579776db376749d5bb14fc43978cd0e5406c
2022-08-31 06:21:29 -06:00
Michael Bestas
084d8165a7 pixel: Fix build-desc-fingerprint.sh not commiting raviole changes
Change-Id: I58dd7978e2f243d9295fcb085f8ae49629a38157
2022-08-29 18:00:11 +03:00
Michael Bestas
04d40847f0 pixel: Android 13
Change-Id: I5fac382703d9b0e9c4fe5525f82d1a55c789d752
2022-08-26 22:25:15 +03:00
Kevin F. Haggerty
e18df415b7 build-webview: Update default webview to 104.0.5112.97
Change-Id: Id45ff1aafcc0e7c1be5547cdcaa9882751e2559e
2022-08-21 15:54:28 +02:00
Michael Bestas
30621697c6 Drop maintainer-checks
This hasn't been in use since late 2017

Change-Id: I4c49f57e1768951b4fcc3fe13f1b52520aa2248b
2022-08-10 21:27:39 +02:00
Nolen Johnson
7c7fa70ddb scripts: pixel: Make build-desc-fingerprint.sh commit changes
Tests: cd lineage/scripts/pixel && ./build-desc-fingerprint.sh coral flame
Notes: No additional issues added in `shellcheck`
Change-Id: I1810ad996d727337b73c6959aaa37bdcaf0d5e5b
2022-07-12 20:08:16 +03:00
Michael Bestas
a6ee1c2396 pixel: Remove unused tmp_dir from build-desc-fingerprint.sh
Change-Id: I5a102f47b6d4450458781bc8b3928ead40820882
2022-07-12 20:08:15 +03:00
Chirayu Desai
0038a97c5b Add copyright headers to all scripts
* https://reuse.software/tutorial/
* reuse addheader --copyright="The Calyx Institute" --license="Apache-2.0" */*.sh

Change-Id: I24ab74da8f4c9ddd8d38da3e782053b10499ea83
2022-07-12 20:08:15 +03:00
Chirayu Desai
ed56c837cd Introduce script to update any var
* To make the manual build id / kernel tag update slightly less manual

Usage:
update-any-var.sh build_id SQ3A.220705.003 oriole raven # For Pixel 6 Jul 2022

TODO: Full automation
Change-Id: Iea350df2653c623b8f8476de4aec9cd1f7461c45
2022-07-12 20:08:10 +03:00
Chirayu Desai
8225cf77aa pixel/build-desc-fingerprint: Don't set -x
Change-Id: Iadae27ab29b6912e194823a46dbacfa0bd3c63e3
2022-07-12 19:40:31 +03:00
Kevin F. Haggerty
7aebea6b11 build-webview: Update default webview to 103.0.5060.71
Change-Id: I54ab19cfb4e4989c94be15318e0f9b86064b0b8c
2022-07-05 06:46:25 -06:00
Kevin F. Haggerty
c071351251 build-webview: Update default webview to 102.0.5005.78
Change-Id: I44508c7efe850bef229ea2a309dde004f30bf54d
2022-05-30 15:42:08 -06:00
Kevin F. Haggerty
93954ec5ad build-webview: Update default webview to 101.0.4951.61
Change-Id: I260c94fdb296d0ed97f47adf06931dd16d74232d
2022-05-11 06:33:32 -06:00
razorloves
2143c17ffc device-deps-regenerator: Add common device repos to blacklist
Change-Id: I77aacd48716dcbb4ef5cc7a9421d501b73688dd9
2022-04-25 21:08:00 -05:00