Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

devops: fix export.sh to work with rolls

Browse source
This commit is contained in:
Andrey Lushnikov 2019-11-22 19:18:52 -08:00
parent 1a98a4d5e8
commit 558e38debe
1 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
browser_patches/export.sh
View file

@ -92,29 +92,40 @@ else
fi fi
CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD) CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
BASE_REVISION=$(git merge-base $REMOTE_BROWSER_UPSTREAM/$BASE_BRANCH $CURRENT_BRANCH) NEW_BASE_REVISION=$(git merge-base $REMOTE_BROWSER_UPSTREAM/$BASE_BRANCH $CURRENT_BRANCH)
echo "==============================================================" echo "=============================================================="
echo " Repository: $FRIENDLY_CHECKOUT_PATH" echo " Repository: $FRIENDLY_CHECKOUT_PATH"
echo " Changes between branches: $REMOTE_BROWSER_UPSTREAM/$BASE_BRANCH..$CURRENT_BRANCH" echo " Changes between branches: $REMOTE_BROWSER_UPSTREAM/$BASE_BRANCH..$CURRENT_BRANCH"
echo " BASE_REVISION: $BASE_REIVSION" echo " BASE_REVISION: $NEW_BASE_REVISION"
echo echo
echo $BASE_REIVSION > $EXPORT_PATH/BASE_REVISION git checkout -b tmpsquash_export_script $NEW_BASE_REVISION
git checkout -b tmpsquash_export_script $BASE_REIVSION
git merge --squash $CURRENT_BRANCH git merge --squash $CURRENT_BRANCH
HAS_CHANGES="false"
if ! git commit -am "chore: bootstrap"; then if ! git commit -am "chore: bootstrap"; then
echo "No changes!" echo "-- no code changes"
git checkout $CURRENT_BRANCH else
git branch -D tmpsquash_export_script HAS_CHANGES="true"
exit 0 PATCH_NAME=$(git format-patch -1 HEAD)
mv $PATCH_NAME $EXPORT_PATH/patches/
fi fi
PATCH_NAME=$(git format-patch -1 HEAD)
mv $PATCH_NAME $EXPORT_PATH/patches/
git checkout $CURRENT_BRANCH git checkout $CURRENT_BRANCH
git branch -D tmpsquash_export_script git branch -D tmpsquash_export_script
if [[ "$NEW_BASE_REVISION" == "$BASE_REVISION" ]]; then
echo "-- no BASE_REVISION changes"
else
HAS_CHANGES="true"
fi
if [[ $HAS_CHANGES == "false" ]]; then
exit 0
fi
echo "REMOTE_URL=\"$REMOTE_URL\" echo "REMOTE_URL=\"$REMOTE_URL\"
BASE_BRANCH=\"$BASE_BRANCH\" BASE_BRANCH=\"$BASE_BRANCH\"
BASE_REVISION=\"$BASE_REIVSION\"" > $EXPORT_PATH/UPSTREAM_CONFIG.sh BASE_REVISION=\"$NEW_BASE_REVISION\"" > $EXPORT_PATH/UPSTREAM_CONFIG.sh
# Increment BUILD_NUMBER # Increment BUILD_NUMBER
BUILD_NUMBER=$(cat $EXPORT_PATH/BUILD_NUMBER) BUILD_NUMBER=$(cat $EXPORT_PATH/BUILD_NUMBER)