Alex Buynytskyy
92f501aef7
Use 'ours' conflict resolution strategy.
...
We should never use anything from finalization commits.
Bug: 243966946
Test: run locally
Change-Id: I4b0cedd7e82362cc98961e627d0103cfba18fc6d
2022-11-03 12:29:06 -07:00
Alex Buynytskyy
739a311cc6
Better cleanup and revert.
...
Bug: 243966946
Test: run locally
Change-Id: I09f7cb19bb7f97d807a75189bf75e7c2fd25edee
2022-11-03 14:43:58 +00:00
Alex Buynytskyy
07bc317c45
Concatenate cl hashes so that git revert can revert multiple commits.
...
Bug: 243966946
Test: run locally
Change-Id: I59bd588f5368f8e47fd9272b561b63d940e1072d
2022-11-01 18:45:51 -07:00
Alex Buynytskyy
c66908b638
Revert all previous commits.
...
Bug: 243966946
Test: time ./build/make/finalize-step-1.sh
Change-Id: Iee5d3d76990d8f1785d34c0898ea86792e2d95fe
2022-09-28 22:32:53 +00:00
Alex Buynytskyy
73e0f97b8c
Minor refactor.
...
- cleanup local state before exiting,
- move cl upload to a separate function for readability.
Bug: 243966946
Test: run locally
Change-Id: If66d52168abc2e4878fe99255397d7432874e141
2022-09-23 11:09:21 -07:00
Alex Buynytskyy
3bd1b91877
Extract finalization build to a separate script.
...
For finalization CI we'll do multiple builds and tests in a separate
branch.
Bug: 243966946
Test: abdt in nightly
Change-Id: Ie90705de3145c06363536613e57c0de504b5eb1b
2022-09-22 11:32:29 -07:00
Alex Buynytskyy
0842d212b9
Finalization script, step 1.
...
- cleanup
- revert previous commits
- vndk + resources + sdk finalization + test
- create cls
- send to Gerrit
- (tbd) submit
Bug: 243966946
Test: run scripts locally
Change-Id: Icd4f07c64c2ef93831dc5fc7de2d5e832604e88d
2022-09-20 20:31:04 -07:00
