archive-gh-me/offline-editor-js
1
0
Fork 0
mirror of https://github.com/Esri/offline-editor-js.git synced 2025-12-15 15:20:05 +00:00
Code Issues Projects Releases Wiki Activity

add breaks to push and pull scripts

Browse Source
This commit is contained in:
Andy Gup 2015-08-12 14:35:01 -06:00
parent c4a742f7a1
commit abd1a6845d
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/pull.sh
View File

@ -18,7 +18,7 @@ git checkout master
echo "pull upstream master"
git pull upstream master
echo "push origin master"
read -p "Press [Enter] to push origin master..."
git push origin master
# Delete the version branch
@ -29,10 +29,11 @@ git branch -D $VERSION
echo "checkout gh-pages"
git checkout gh-pages
echo "merge master"
read -p "Press [Enter] to merge gh-pages with master..."
git merge master
echo "push origin gh-pages"
read -p "Press [Enter] to push gh-pages to origin..."
git push origin gh-pages
echo "Now create a pull request for gh-pages manually on github."

17
scripts/push.sh
View File

@ -3,8 +3,8 @@
##########################################################
# This script provides final build automation for the repo.
# It's responsible for pushing the build. Once your
* branch has been merged by master then use the pull script
* to finalize syncing up your git and github repos.
# branch has been merged by master then use the pull script
# to finalize syncing up your git and github repos.
#
# PRE-REQS:
# 1. Make sure you have node, npm and grunt installed
@ -13,7 +13,8 @@
#
# INSTRUCTIONS:
#
# 0. MAKE SURE you look thru the steps here and that everything is in order before you hit the button.
# 0. MAKE SURE you look thru the steps here and that everything is in order before you hit the button. The only file
# that should be pending for commit is CHANGELOG and/or package.json.
# 1. Make sure in package.json to name your releases after the version number, such as v2.0.0, v2.0.1, v2.1.1, etc.
# 2. To submit changes to your github branch: npm run push. You can still make changes on this branch if you need to.
# 3. After those changes have been merged on esri/master then sync up gh-pages: npm run pull
@ -28,14 +29,19 @@ NAME=$(node --eval "console.log(require('./package.json').name);")
# Checkout temp branch for release
git checkout v$VERSION
# Add files, get ready to commit
# Add files, get ready to commit.
# CHANGELOG should have pending changes
read -p "Press [Enter] to add git files..."
git add CHANGELOG.md
git add package.json
git add dist
# Create the release zip file
echo "creating zip of /dist"
zip -r $NAME-v$VERSION.zip dist
# Run gh-release to create the tag and push release to github
read -p "Press [Enter] to push a release file..."
gh-release --assets $NAME-v$VERSION.zip
# Remove the temp zip file
@ -45,13 +51,14 @@ rm $NAME-v$VERSION.zip
git commit -m "$VERSION"
# Push to origin
read -p "Press [Enter] to push commits to origin..."
git push origin v$VERSION
echo "zip file deleted"
echo "push script: done"
# publish release on NPM
echo "npm publish"
read -p "Press [Enter] to npm publish..."
npm publish
echo "Go to your github branch $VERSION, review changes then create pull request to esri/master"