exit 1
fi
+grep "$VERSION" package.json
+if [ $? -ne 0 ]; then
+ echo "Version in package.json doesn't match command line argument." >&2
+ exit 1
+fi
+
+grep "v$VERSION" bower.json
+if [ $? -ne 0 ]; then
+ echo "Version in bower.json doesn't match command line argument." >&2
+ exit 1
+fi
+
make lint test test-combined
if [ $? -ne 0 ]; then
echo "Tests failed. Won't release!" >&2
exit 1
fi
-# Everything is good. Tag this release and push it.
+# Everything is good.
+# Switch to the "releases" branch, merge this change and tag it.
+echo "Switching branches to do the release."
+git checkout releases
+git merge --no-ff $branch
+
COMMIT=$(git rev-parse HEAD)
echo "Tagging commit $COMMIT as version $VERSION"
git tag -a "v$VERSION" -m "Release of version $VERSION"
-git push
+git push --tags
echo "Release was successful!"
-echo "Don't forget to merge changes on this branch back into master."
+echo "Pushing the new version to dygraphs.com..."
+./push-to-web.sh dygraphs.com:dygraphs.com
+
+echo "Success!\n"
+echo "Don't forget to merge changes on this branch back into master:"
+echo "git merge --no-ff $branch"
+
+# Discourage users from working on the "releases" branch.
+git checkout master