From c097a4c640b777d9869fdba12d9aa0cd7e994fbe Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Wed, 12 Feb 2014 09:18:38 -0600 Subject: [PATCH 1/2] chore(release): v0.9.24 "Peleguin" --- CHANGELOG.md | 40 +++++++++++++++-------------- scripts/release/finalize-version.sh | 2 +- scripts/travis/ci.sh | 24 ++++++++--------- 3 files changed, 34 insertions(+), 32 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9bca4858eb..7595185d6b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ -### 0.9.24 (2014-02-12) +### 0.9.24 "Peleguin" (2014-02-12) #### Bug Fixes @@ -38,15 +38,17 @@ * **domUtil:** add getPositionInParent function ((a970f0bd)) * **grid:** Added classes, variables and mixins for responsive grid options ((1cdb999e)) * **ionic:** remove angular-sanitize (ngSanitize) as dependency ((e7556233)) -* **ionicToggle:** allow ngDisabled binding ((0fe44867)) * **list:** reordering scrolls page, reordering performance better ((7f4b28d9), closes (#521)) * **sideMenuContent:** watch `drag-content` attribute ((7f9bfb5a)) -* **tab:** allow html in tab `title` attribute ((0facb120), closes (#528)) -* **tabs:** allow tab `badge-style` attribute to set badge class ((b11e0f51)) -* **toggle:** Disable toggle w/ ng-disabled, closes #541 ((2eab747d)) +* **tabs:** + * allow html in tab `title` attribute ((0facb120), closes (#528)) + * allow tab `badge-style` attribute to set badge class ((b11e0f51)) +* **toggle:** + * Disable toggle w/ ng-disabled, closes #541 ((2eab747d)) + * allow ngDisabled binding ((0fe44867)) -## 0.9.23 "Alpha Oxen" (2014-02-05) +### 0.9.23 "Alpha Oxen" (2014-02-05) - Android back button correctly goes back a view or closes the app - CustomEvent polyfill improvements for Android - Fix tab icon alignments @@ -66,7 +68,7 @@ - `bower install ionic`: release files are now located in the `release` folder, not `dist`. -## 0.9.22 "Alpha Narwhal" (2014-01-30) +### 0.9.22 "Alpha Narwhal" (2014-01-30) - Tap polyfill overhaul to remove 300ms delay when firing a click - Android click firing twice fixes - Fixes with the tap polyfill for directives using ng-click @@ -74,7 +76,7 @@ - Reduce default button height -## 0.9.21 "Alpha Maine Coon" (2014-01-24) +### 0.9.21 "Alpha Maine Coon" (2014-01-24) - Toggle directive now includes .item.item-toggle wrapper - Toggle/Checkbox/Radio implements ng-model/ng-value/ng-change - Ionicons v1.4.2, icons now using :before pseudo @@ -89,7 +91,7 @@ - Remove angular-touch.js and angular-route.js references -## 0.9.20 "Alpha Lynx" (2014-01-14) +### 0.9.20 "Alpha Lynx" (2014-01-14) - Improved transitions between views - Fixed hide-nav-bar/hide-back-button view attributes - Removed title attributes from DOM @@ -98,7 +100,7 @@ - Rename ionic services to use $ionic prefix -## 0.9.19 "Alpha Koala" (2014-01-10) +### 0.9.19 "Alpha Koala" (2014-01-10) - Created ViewState Service to track navigation history - Created navView directive - Removed navPage and navRouter directives @@ -106,49 +108,49 @@ - Update examples to use $stateProvider instead $routeProvider -## 0.9.18 "Alpha Jaguar" (2013-12-18) +### 0.9.18 "Alpha Jaguar" (2013-12-18) - Slide box bug fixes - Fixed issues with minification - Small tweaks -## 0.9.17 "Alpha Iguana" (2013-12-16) +### 0.9.17 "Alpha Iguana" (2013-12-16) - Nav bar button fixes - New slide box overhaul - New list overhaul - Radio button and checkbox fixes -## 0.9.16 "Alpha Hippo" (2013-12-12) +### 0.9.16 "Alpha Hippo" (2013-12-12) - Scrollbars - Scroll bug fixes -## 0.9.15 "Alpha Giraffe" (2013-12-08) +### 0.9.15 "Alpha Giraffe" (2013-12-08) - Scroll view fixes - Radio button and checkbox fixes - Slide box fixes -## 0.9.14 "Alpha Fox" (2013-12-04) +### 0.9.14 "Alpha Fox" (2013-12-04) - Massive scroll performance improvements - Android fixes and perf improvements - Header and nav bar button fixes - Animation performance improvements -## 0.9.13 "Alpha Elephant" (2013-11-26) +### 0.9.13 "Alpha Elephant" (2013-11-26) - nav router back button fixes - Remove back button on first route - Fix forward/back transition on iOS devices which lack history.state -## 0.9.12 "Alpha Dog" (2013-11-24) +### 0.9.12 "Alpha Dog" (2013-11-24) - Fixed some overflow scrolling issues. -## 0.9.11 "Alpha Cat Dog" (2013-11-23) +### 0.9.11 "Alpha Cat Dog" (2013-11-23) -## 0.9.10 "Alpha Cat" (2013-11-23) +### 0.9.10 "Alpha Cat" (2013-11-23) diff --git a/scripts/release/finalize-version.sh b/scripts/release/finalize-version.sh index ea9af7b2f9..0405572db7 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 "--" diff --git a/scripts/travis/ci.sh b/scripts/travis/ci.sh index 5ae4d98fc3..873bf7666c 100755 --- a/scripts/travis/ci.sh +++ b/scripts/travis/ci.sh @@ -51,19 +51,19 @@ function run { fi # 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) + # COMMIT_MESSAGE=$(git log --format=%B -n 1 $TRAVIS_COMMIT | head -c 15) - if [[ "$COMMIT_MESSAGE" == "chore(release:" ]]; then - IS_RELEASE=true - echo "##################################" - echo "# Pushing out a new full release #" - echo "##################################" - else - echo "#####################################" - echo "# Pushing out a new nightly release #" - echo "#####################################" - ./scripts/travis/bump-nightly-version.sh - fi + # if [[ "$COMMIT_MESSAGE" == "chore(release:" ]]; then + IS_RELEASE=true + echo "##################################" + echo "# Pushing out a new full release #" + echo "##################################" + # else + # echo "#####################################" + # echo "# Pushing out a new nightly release #" + # echo "#####################################" + # ./scripts/travis/bump-nightly-version.sh + # fi # Build (make sure to build after version is bumped) grunt build From 96e9d79e910d379d87b5089d5f1726ab2cc223e8 Mon Sep 17 00:00:00 2001 From: Andy Joslin Date: Wed, 12 Feb 2014 10:38:04 -0500 Subject: [PATCH 2/2] chore(post-release): start v0.9.25-alpha --- package.json | 4 ++-- scripts/release/finalize-version.sh | 3 ++- scripts/travis/ci.sh | 35 ++++++++++++++--------------- 3 files changed, 21 insertions(+), 21 deletions(-) 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 0405572db7..399ed48611 100755 --- a/scripts/release/finalize-version.sh +++ b/scripts/release/finalize-version.sh @@ -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 873bf7666c..c1b45f3711 100755 --- a/scripts/travis/ci.sh +++ b/scripts/travis/ci.sh @@ -41,29 +41,28 @@ 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 - IS_RELEASE=true - echo "##################################" - echo "# Pushing out a new full release #" - echo "##################################" - # else - # echo "#####################################" - # echo "# Pushing out a new nightly release #" - # echo "#####################################" - # ./scripts/travis/bump-nightly-version.sh - # fi + 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 "#####################################" + ./scripts/travis/bump-nightly-version.sh + fi # Build (make sure to build after version is bumped) grunt build