LineageOS/scripts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aosp-merger: Fix merged_repos.txt handling after refactor

Browse Source 
Change-Id: I8719e4ab8ddd043eefc1e0c1dca9d427b0f0cc7e
This commit is contained in:
Michael Bestas
2022-01-10 22:23:21 +02:00
committed by Chirayu Desai
parent 6fb4c9a940
commit 788196f219
7 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
aosp-merger/_merge_helper.sh
View File

@@ -48,7 +48,7 @@ PROJECTOPERATION="${OPERATION}"
# Was there any change upstream? Skip if not.
if [[ -z "$(git diff ${OLDTAG} ${NEWTAG})" ]]; then
echo -e "nochange\t\t${PROJECTPATH}"
echo -e "nochange\t\t${PROJECTPATH}" | tee -a "${MERGEDREPOS}"
repo abandon "${STAGINGBRANCH}" .
exit 0
fi
@@ -69,7 +69,7 @@ if [[ "${PROJECTOPERATION}" == "merge" ]]; then
# Check if we've actually changed anything after the merge
# If we haven't, just abandon the branch
if [[ -z "$(git diff HEAD HEAD~1)" ]]; then
echo -e "nochange\t\t${PROJECTPATH}"
echo -e "nochange\t\t${PROJECTPATH}" | tee -a "${MERGEDREPOS}"
repo abandon "${STAGINGBRANCH}" .
exit 0
fi
@@ -82,4 +82,4 @@ CONFLICT=""
if [[ -n "$(git status --porcelain)" ]]; then
CONFLICT="conflict-"
fi
echo -e "${CONFLICT}${PROJECTOPERATION}\t\t${PROJECTPATH}"
echo -e "${CONFLICT}${PROJECTOPERATION}\t\t${PROJECTPATH}" | tee -a "${MERGEDREPOS}"

36
aosp-merger/aosp-merger.sh
View File

@@ -30,11 +30,17 @@ readonly vars_path="${script_path}/../vars"
source "${vars_path}/common"
TOP="${script_path}/../../.."
## HELP MESSAGE (USAGE INFO)
# TODO
### FUNCTIONS ###
merge_aosp() {
"${script_path}"/merge-aosp.sh merge "${aosp_tag}" "${prev_aosp_tag}"
}
merge_aosp_forks() {
"${script_path}"/merge-aosp-forks.sh merge "${prev_aosp_tag}" "${aosp_tag}"
}
@@ -65,12 +71,30 @@ help_message() {
}
main() {
merge_aosp_forks
read -p "Waiting for conflict resolution before squashing. Press enter when done."
read -p "Once more, just to be safe"
squash_aosp_merge
upload_squash_to_review
echo "Don't forget to update the manifest!"
if [ "$#" -eq 0 ]; then
export MERGEDREPOS="${TOP}/merged_repos.txt"
merge_aosp_forks
read -p "Waiting for conflict resolution before squashing. Press enter when done."
read -p "Once more, just to be safe"
squash_aosp_merge
upload_squash_to_review
echo "Don't forget to update the manifest!"
unset MERGEDREPOS
elif [ "${1}" = "aosp" ]; then
export MERGEDREPOS="${TOP}/merged_repos_aosp.txt"
merge_aosp
unset MERGEDREPOS
elif [ "${1}" = "submit-platform" ]; then
export MERGEDREPOS="${TOP}/merged_repos.txt"
push_merge
unset MERGEDREPOS
fi
}
### RUN PROGRAM ###

3
aosp-merger/merge-aosp-forks.sh
View File

@@ -32,7 +32,6 @@ readonly vars_path="${script_path}/../vars"
source "${vars_path}/common"
TOP="${script_path}/../../.."
MERGEDREPOS="${TOP}/merged_repos.txt"
MANIFEST="${TOP}/.repo/manifests/default.xml"
BRANCH="${calyxos_branch}"
export STAGINGBRANCH="staging/${BRANCH}_${OPERATION}-${NEWTAG}"
@@ -65,7 +64,7 @@ repo abandon "${STAGINGBRANCH}"
# Iterate over each forked project
for PROJECTPATH in ${PROJECTPATHS}; do
"${script_path}"/_merge_helper.sh "${PROJECTPATH}" "${@}" | tee -a "${MERGEDREPOS}"
"${script_path}"/_merge_helper.sh "${PROJECTPATH}" "${@}"
done
unset STAGINGBRANCH

3
aosp-merger/merge-aosp.sh
View File

@@ -33,7 +33,6 @@ readonly vars_path="${script_path}/../vars"
source "${vars_path}/common"
TOP="${script_path}/../../.."
MERGEDREPOS="${TOP}/merged_repos_aosp.txt"
MANIFEST="${TOP}/.repo/manifests/default.xml"
export STAGINGBRANCH="staging/${OLDTAG}_${OPERATION}-${NEWTAG}"
@@ -61,7 +60,7 @@ repo abandon "${STAGINGBRANCH}"
# Iterate over each forked project
for PROJECTPATH in ${PROJECTPATHS}; do
"${script_path}"/_merge_helper.sh "${PROJECTPATH}" "${@}" | tee -a "${MERGEDREPOS}"
"${script_path}"/_merge_helper.sh "${PROJECTPATH}" "${@}"
done
unset STAGINGBRANCH

1
aosp-merger/push-merge.sh
View File

@@ -32,7 +32,6 @@ readonly vars_path="${script_path}/../vars"
source "${vars_path}/common"
TOP="${script_path}/../../.."
MERGEDREPOS="${TOP}/merged_repos.txt"
BRANCH="${calyxos_branch}"
STAGINGBRANCH="staging/${BRANCH}_${OPERATION}-${NEWTAG}"

1
aosp-merger/squash.sh
View File

@@ -32,7 +32,6 @@ readonly vars_path="${script_path}/../vars"
source "${vars_path}/common"
TOP="${script_path}/../../.."
MERGEDREPOS="${TOP}/merged_repos.txt"
BRANCH="${calyxos_branch}"
STAGINGBRANCH="staging/${BRANCH}_${OPERATION}-${NEWTAG}"
SQUASHBRANCH="squash/${BRANCH}_${OPERATION}-${NEWTAG}"

1
aosp-merger/upload-squash.sh
View File

@@ -32,7 +32,6 @@ readonly vars_path="${script_path}/../vars"
source "${vars_path}/common"
TOP="${script_path}/../../.."
MERGEDREPOS="${TOP}/merged_repos.txt"
BRANCH="${calyxos_branch}"
SQUASHBRANCH="squash/${BRANCH}_${OPERATION}-${NEWTAG}"