diff --git a/package.json b/package.json index cfc5c4248c..b0f8fc4001 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "ionic", "private": false, - "version": "0.9.24", - "codename": "peleguin", + "version": "0.9.25-alpha", + "codename": "quitzal", "devDependencies": { "grunt": "~0.4.1", "grunt-bump": "0.0.13", diff --git a/scripts/release/finalize-version.sh b/scripts/release/finalize-version.sh index ea9af7b2f9..399ed48611 100755 --- a/scripts/release/finalize-version.sh +++ b/scripts/release/finalize-version.sh @@ -30,7 +30,7 @@ function prepare { grunt changelog git add package.json bower.json component.json release CHANGELOG.md - git commit -m "chore(release): v$VERSION" + git commit -m "chore(release): v$VERSION \"$CODENAME\"" git tag -m "v$VERSION" v$VERSION echo "--" @@ -46,7 +46,8 @@ function publish { VERSION=$(readJsonProp "package.json" "version") - git push --tags origin master + git push origin master + git push origin v$VERSION echo "-- Version published as v$VERSION successfully!" diff --git a/scripts/travis/ci.sh b/scripts/travis/ci.sh index 5ae4d98fc3..c1b45f3711 100755 --- a/scripts/travis/ci.sh +++ b/scripts/travis/ci.sh @@ -41,24 +41,23 @@ function run { # TODO Saucelabs settings need more tweaking before it becomes stable (sometimes it fails to connect) # grunt karma:sauce --reporters=dots - if [[ "$TRAVIS_BRANCH" != "master" ]]; then - echo "-- We are not on branch master, instead we are on branch $TRAVIS_BRANCH. Will not push build out." - exit 0 - fi if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then echo "-- This is a pull request build; will not push build out." exit 0 fi + + LATEST_TAG_COMMIT=$(git rev-list $(git describe --tags --abbrev=0) | head -n 1) - # If latest commit message starts with 'chore(release):' it's a release - COMMIT_MESSAGE=$(git log --format=%B -n 1 $TRAVIS_COMMIT | head -c 15) - - if [[ "$COMMIT_MESSAGE" == "chore(release:" ]]; then + if [[ "$TRAVIS_COMMIT" == "$LATEST_TAG_COMMIT" ]]; then IS_RELEASE=true echo "##################################" echo "# Pushing out a new full release #" echo "##################################" else + if [[ "$TRAVIS_BRANCH" != "master" ]]; then + echo "-- We are not on branch master, instead we are on branch $TRAVIS_BRANCH. Will not push build out." + exit 0 + fi echo "#####################################" echo "# Pushing out a new nightly release #" echo "#####################################"