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

aosp-merger: Remove unused BRANCH from upload-squash

Browse Source 
Change-Id: Ie744348a31eb159914b93ec4627be03bc7e1be34
This commit is contained in:
Michael Bestas
2022-06-19 09:02:25 +03:00
committed by Chirayu Desai
parent cf357b2ac3
commit ffddfc9fd6
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,7 +41,6 @@ readonly vars_path="${script_path}/../../../vendor/lineage/vars"
source "${vars_path}/common" source "${vars_path}/common"
TOP="${script_path}/../../.." TOP="${script_path}/../../.."
BRANCH="${lineageos_branch}"
SQUASHBRANCH="squash/${BRANCHSUFFIX}" SQUASHBRANCH="squash/${BRANCHSUFFIX}"
if [ "${PIXEL}" = true ]; then if [ "${PIXEL}" = true ]; then
TOPIC="${topic}_pixel" TOPIC="${topic}_pixel"
@@ -52,7 +51,7 @@ fi
# List of merged repos # List of merged repos
PROJECTPATHS=$(cat ${MERGEDREPOS} | grep -w merge | awk '{printf "%s\n", $2}') PROJECTPATHS=$(cat ${MERGEDREPOS} | grep -w merge | awk '{printf "%s\n", $2}')
echo "#### Branch = ${BRANCH} Squash branch = ${SQUASHBRANCH} ####" echo "#### Squash branch = ${SQUASHBRANCH} ####"
# Make sure manifest and forked repos are in a consistent state # Make sure manifest and forked repos are in a consistent state
echo "#### Verifying there are no uncommitted changes on LineageOS forked AOSP projects ####" echo "#### Verifying there are no uncommitted changes on LineageOS forked AOSP projects ####"