diff options
| author | Vishal Bhoj <vishal.bhoj@linaro.org> | 2017-02-09 18:29:22 +0530 |
|---|---|---|
| committer | Vishal Bhoj <vishal.bhoj@linaro.org> | 2017-02-09 13:04:12 +0000 |
| commit | 849c0662be7e27d295f96eddd4b26fe1a605d691 (patch) | |
| tree | e978426db52d33ed382b25c7e059912ee88b5bcd | |
| parent | d6f4eacc3ef2c324be049c9e60989f9c91b31557 (diff) | |
build-android: handle patch to local_manifest in private repo
Change-Id: I805b439de9ce6f33cf484002dc52fb7f58c5bb7a
Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
| -rw-r--r-- | build-scripts/build-android | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/build-scripts/build-android b/build-scripts/build-android index ca3d245..894717f 100644 --- a/build-scripts/build-android +++ b/build-scripts/build-android @@ -72,17 +72,17 @@ else fi if [ -n "$GERRIT_PROJECT" ] && [ $GERRIT_PROJECT != "android-build-configs" ] && [ $GERRIT_EVENT_TYPE == "comment-added" ]; then - if [ "$GERRIT_PROJECT" == "platform/manifest" ]; then + if [ ${GERRIT_HOST} == "dev-private-review.linaro.org" ]; then + GERRIT_URL="ssh://git@${GERRIT_HOST}/${GERRIT_PROJECT}" + else + GERRIT_URL="http://${GERRIT_HOST}/${GERRIT_PROJECT}" + fi + if [ "$GERRIT_PROJECT" == "platform/manifest" ] || [ "$GERRIT_PROJECT" == "linaro-art/platform/manifest" ]; then cd .repo/local_manifests; - git pull http://android-review.linaro.org/platform/manifest $GERRIT_REFSPEC + git pull ${GERRIT_URL} $GERRIT_REFSPEC cd - else cd `grep -rni $GERRIT_PROJECT\" .repo/local_manifests | grep -Po 'path="\K[^"]*'` - if [ ${GERRIT_HOST} == "dev-private-review.linaro.org" ]; then - GERRIT_URL="ssh://git@${GERRIT_HOST}/${GERRIT_PROJECT}" - else - GERRIT_URL="http://${GERRIT_HOST}/${GERRIT_PROJECT}" - fi if git pull ${GERRIT_URL} ${GERRIT_REFSPEC} | grep -q "Automatic merge failed"; then git reset --hard echo "Error: *** Error patch merge failed" |