mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2025-08-20 12:29:55 +08:00
chore(CI): attempt to rebase around other commits made during doc/demo gen
This commit is contained in:
@ -44,6 +44,11 @@ function run {
|
|||||||
else
|
else
|
||||||
git add -A
|
git add -A
|
||||||
git commit -am "Automated build of ionic v$VERSION driftyco/$CIRCLE_PROJECT_REPONAME@$CIRCLE_SHA1"
|
git commit -am "Automated build of ionic v$VERSION driftyco/$CIRCLE_PROJECT_REPONAME@$CIRCLE_SHA1"
|
||||||
|
# in case a different commit was pushed to ionic-site during doc/demo gen,
|
||||||
|
# try to rebase around it before pushing
|
||||||
|
git fetch
|
||||||
|
git rebase
|
||||||
|
|
||||||
git push origin master
|
git push origin master
|
||||||
|
|
||||||
echo "-- Updated docs for $VERSION_NAME succesfully!"
|
echo "-- Updated docs for $VERSION_NAME succesfully!"
|
||||||
|
Reference in New Issue
Block a user