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

aosp-merger: Adapt for LineageOS vars usage

Browse Source 
Change-Id: Id63a7377ed68ee7d7743af31747eade2d785369e
This commit is contained in:
Michael Bestas
2022-01-13 18:04:19 +02:00
committed by Chirayu Desai
parent adcf6fca04
commit b92af37df1
7 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,15 +27,15 @@ fi
### CONSTANTS ###
readonly script_path="$(cd "$(dirname "$0")";pwd -P)"
readonly vars_path="${script_path}/../vars"
readonly vars_path="${script_path}/../../../vendor/lineage/vars"
source "${vars_path}/common"
TOP="${script_path}/../../.."
BRANCH="${calyxos_branch}"
BRANCH="${lineageos_branch}"
STAGINGBRANCH="staging/${BRANCH}_${OPERATION}-${NEWTAG}"
# Source build environment (needed for calyxremote)
# Source build environment (needed for lineageremote)
source "${TOP}/build/envsetup.sh"
# List of merged repos
@@ -62,6 +62,6 @@ for PROJECTPATH in ${PROJECTPATHS}; do
cd "${TOP}/${PROJECTPATH}"
echo "#### Submitting ${PROJECTPATH} merge ####"
git checkout "${STAGINGBRANCH}"
calyxremote | grep -v "Remote 'calyx' created"
git push calyx HEAD:refs/heads/"${BRANCH}"
lineageremote | grep -v "Remote 'lineage' created"
git push lineage HEAD:refs/heads/"${BRANCH}"
done