chore(travis): codename, build version updates

package.json

@@ -2,7 +2,7 @@
   "name": "ionic",
   "private": false,
   "version": "0.9.23-alpha",
-  "codename": "maine-coon",
+  "codename": "robot-takeover",
   "devDependencies": {
     "grunt": "~0.4.1",
     "grunt-bump": "0.0.13",

scripts/cdn/publish.sh

@@ -23,7 +23,7 @@ function run {
   CODENAME=$(readJsonProp "$PROJECT_DIR/package.json" "codename")
 
   echo "-- Cloning ionic-code..."
-  git clone https://$GH_ORG:$GH_TOKEN@github.com/$GH_ORG/ionic-code.git $IONIC_CODE_DIR
+  # git clone https://$GH_ORG:$GH_TOKEN@github.com/$GH_ORG/ionic-code.git $IONIC_CODE_DIR
 
   VERSION_DIR=$IONIC_CODE_DIR/$VERSION_LABEL
   rm -rf $VERSION_DIR

scripts/travis/bump-nightly-version.sh

@@ -9,20 +9,10 @@ ARG_DEFS=(
 function run {
 
   cd ../..
-  echo $PWD
 
   VERSION=$(readJsonProp "package.json" "version")
 
-  # If no travis build number (if this is a test-run on local machine),
-  # just generate a test number
-  if [ -z "$TRAVIS_BUILD_NUMBER" ]; then
-    TRAVIS_BUILD_NUMBER=1
-  fi
-
-  # 7-byte sha for this commit
-  SHA=$(git rev-parse HEAD | head -c 7)
-
-  NEW_VERSION="$VERSION-$TRAVIS_BUILD_NUMBER-$SHA"
+  NEW_VERSION="$VERSION-$TRAVIS_BUILD_NUMBER"
 
   replaceJsonProp "package.json" "version" "$NEW_VERSION"
 

scripts/travis/ci.sh

@@ -10,17 +10,20 @@ function init {
   if [[ "$TRAVIS" == "true" ]]; then
     git config --global user.name 'Ionotron'
     git config --global user.email hi@ionicframework.com
+    # for testing, use your github username as GH_ORG to push to
+    export GH_ORG=driftyco
   else
     # For testing if we aren't on travis
     export TRAVIS_BRANCH=master
+    export TRAVIS_BUILD_NUMBER=$RANDOM
+    # for testing, use your github username as GH_ORG to push to
+    export GH_ORG=ajoslin
   fi
 }
 
 function run {
   cd ../..
 
-  # for testing, use your fork as GH_ORG to push to
-  export GH_ORG=driftyco
 
   # Jshint & check for stupid mistakes
   grunt jshint ddescribe-iit merge-conflict
@@ -28,9 +31,6 @@ function run {
   # Run simple quick tests on Phantom to be sure any tests pass
   grunt karma:single --browsers=PhantomJS --reporters=dots
 
-  # Build
-  grunt build
-
   # Do sauce test with all browsers (takes longer)
   # TODO Saucelabs settings need more tweaking before it becomes stable (sometimes it fails to connect)
   # grunt karma:sauce --reporters=dots
@@ -56,6 +56,9 @@ function run {
     ./scripts/travis/bump-nightly-version.sh
   fi
 
+  # Build (make sure to build after version is bumped)
+  grunt build
+
   # Version label used on the CDN: nightly or the version name
   if [[ $IS_RELEASE == "true" ]]; then
     VERSION_LABEL=$(readJsonProp "package.json" "version")