scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2025-01-01 02:38:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update publish.sh script to work with develop / master branches.

Browse source
This commit is contained in:
Jürg Lehni 2015-08-21 17:16:14 +02:00
parent dacb69b697
commit 599e595916
1 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
build/publish.sh
View file

@ -33,6 +33,9 @@ cd ../paperjs.org
SITE_DIR=`PWD` SITE_DIR=`PWD`
DIST_FILE=content/11-Download/paperjs-v$VERSION.zip # Relative to $SITE_DIR DIST_FILE=content/11-Download/paperjs-v$VERSION.zip # Relative to $SITE_DIR
cd $PAPER_DIR
# Make sure we're in the right branch
git checkout develop
cd $PAPER_DIR/build cd $PAPER_DIR/build
./dist.sh ./dist.sh
cd $PAPER_DIR cd $PAPER_DIR
@ -46,14 +49,28 @@ git add -u package.json
git add -u component.json git add -u component.json
# Add all changed files in dist # Add all changed files in dist
git add -u dist git add -u dist
# Commit # Commit version
git commit -m "Bump version to v$VERSION" git commit -m "Release version v$VERSION"
# Tag & Push # Tag version
git tag "v$VERSION" git tag "v$VERSION"
git push # Merge develop into master
git checkout master
git merge develop -X theirs
# Push commits on both branches and tags
git push origin master develop
git push --tags git push --tags
# Publish # Publish
npm publish npm publish
# Go back to develop branch and switch to using load.js again
git checkout develop
cd $PAPER_DIR/build
./load.sh
cd $PAPER_DIR
# Add all changed files in dist
git add -u dist
# Commit version
git commit -m "Switch back to load.js versions for development."
git push origin develop
# Copy paperjs.zip to the website's download folder # Copy paperjs.zip to the website's download folder
cd $SITE_DIR cd $SITE_DIR