StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

finalization: use same repo branch during dry-run

Browse Source 
Teach step-*.sh to re-use the same branch name if running in dry-run
mode. This is useful for running the steps sequentially: if using
different branch names, each 'repo start' will undo the changes created
during the previous step-*.sh.

Bug: 323940469
Test: croot && build/tools/finalization/step-1.sh --dry-run && build/tools/finalization/step-2.sh --dry-run
Ignore-AOSP-first: VIC finalization happens outside AOSP
Change-Id: I720f294f6abf5a8b276bb30f8c531fcbea749b76
This commit is contained in:
Mårten Kongstad
2024-04-08 16:18:47 +02:00
parent c0306cfc31
commit 6c6a1b5b8e
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/finalization/step-1.sh
View File

@@ -7,7 +7,7 @@ function commit_step_1_changes() {
set +e
repo forall -c '\
if [[ $(git status --short) ]]; then
repo start "$FINAL_PLATFORM_CODENAME-SDK-Finalization" ;
repo start "'$repo_branch'" ;
git add -A . ;
git commit -m "$FINAL_PLATFORM_CODENAME is now $FINAL_PLATFORM_SDK_VERSION and extension version $FINAL_MAINLINE_EXTENSION" \
-m "Ignore-AOSP-First: $FINAL_PLATFORM_CODENAME Finalization
@@ -19,8 +19,9 @@ Test: build";
function finalize_step_1_main() {
local top="$(dirname "$0")"/../../../..
source $top/build/make/tools/finalization/command-line-options.sh
source $top/build/make/tools/finalization/environment.sh
local repo_branch="$FINAL_PLATFORM_CODENAME-SDK-Finalization"
source $top/build/make/tools/finalization/command-line-options.sh
source $top/build/make/tools/finalization/finalize-sdk-resources.sh