Commit Graph

11 Commits

Author SHA1 Message Date
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
f4883e22ea aosp-merger: Use device_branch for pixel device/kernel merges
Change-Id: Ib3c0479fc753aeeccc13c5fbe8e80c5231cf1a19
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
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
c44154f25c aosp-merger: Switch all scripts to argument parsing
Change-Id: I7af863d3952e7ae9de16860404bccd2b582caa20
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
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
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
e736c1d62e aosp-merger: Add script that pushes the merge to refs/heads
Change-Id: I6d263d8ccc6fc6854b8e9d7301e556b15987a2e7
2023-03-21 04:59:43 +05:30