6c6a1b5b8e
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
38 lines
1.4 KiB
Bash
Executable file
38 lines
1.4 KiB
Bash
Executable file
#!/bin/bash
|
|
# Script to perform a 2nd step of Android Finalization: REL finalization, create CLs and upload to Gerrit.
|
|
|
|
function commit_step_2_changes() {
|
|
repo forall -c '\
|
|
if [[ $(git status --short) ]]; then
|
|
repo start "'$repo_branch'" ;
|
|
git add -A . ;
|
|
git commit -m "$FINAL_PLATFORM_CODENAME/$FINAL_PLATFORM_SDK_VERSION is now REL" \
|
|
-m "Ignore-AOSP-First: $FINAL_PLATFORM_CODENAME Finalization
|
|
Bug: $FINAL_BUG_ID
|
|
Test: build";
|
|
|
|
repo upload '"$repo_upload_dry_run_arg"' --cbr --no-verify -o nokeycheck -t -y . ;
|
|
fi'
|
|
}
|
|
|
|
function finalize_step_2_main() {
|
|
local top="$(dirname "$0")"/../../../..
|
|
source $top/build/make/tools/finalization/environment.sh
|
|
local repo_branch="$FINAL_PLATFORM_CODENAME-SDK-Finalization-Rel"
|
|
source $top/build/make/tools/finalization/command-line-options.sh
|
|
|
|
# prebuilts etc
|
|
source $top/build/make/tools/finalization/finalize-sdk-rel.sh
|
|
|
|
# move all changes to finalization branch/topic and upload to gerrit
|
|
commit_step_2_changes
|
|
|
|
# build to confirm everything is OK
|
|
local m_next="$top/build/soong/soong_ui.bash --make-mode TARGET_RELEASE=next TARGET_PRODUCT=aosp_arm64 TARGET_BUILD_VARIANT=userdebug"
|
|
$m_next
|
|
|
|
local m_fina="$top/build/soong/soong_ui.bash --make-mode TARGET_RELEASE=fina_2 TARGET_PRODUCT=aosp_arm64 TARGET_BUILD_VARIANT=userdebug"
|
|
$m_fina
|
|
}
|
|
|
|
finalize_step_2_main $@
|