set disttag in travis build

Narretz · Narretz · commit 81ad06287c0e · 2017-07-07T21:38:00.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -48,7 +48,6 @@ notifications:
 jobs:
   include:
     - stage: deploy
-      script: grunt package && grunt compress:uploadBuild && echo "branch" && echo $TRAVIS_BRANCH && echo "pull request" && echo $TRAVIS_PULL_REQUEST && echo "tag" && echo $TRAVIS_TAG && echo "DIST_TAG" && echo $DIST_TAG
       before_script: skip
       before_deploy: |
         function keep_alive() {
@@ -67,7 +66,7 @@ jobs:
             secure: $FIREBASE_TOKEN
           on:
             repo: angular/angular.js
-            condition: $TRAVIS_TAG != '' && cat package.json | jq '.distTag' = latest
+            condition: $TRAVIS_TAG = '' && $DISTTAG = next
             all_branches: true
         - provider: gcs
           access_key_id: GOOGLDB7W2J3LFHICF3R
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -326,7 +326,7 @@ module.exports = function(grunt) {
         dot: true,
         dest: dist + '/'
       },
-      uploadBuild: {
+      firebaseCodeDeploy: {
         options: {
           mode: 'gzip'
         },
diff --git a/scripts/travis/before_build.sh b/scripts/travis/before_build.sh
@@ -2,15 +2,6 @@
 
 set -e
 
-DISTTAG=$( cat package.json | jq '.distTag' | tr -d \" )
-
-echo $TRAVIS_TAG
-echo $DISTTAG
-
-if [[ $TRAVIS_TAG = '' && $DISTTAG = "next" ]]; then
-  echo "read from json";
-fi
-
 yarn global add grunt-cli@1.2.0
 
 mkdir -p $LOGS_DIR
diff --git a/scripts/travis/build.sh b/scripts/travis/build.sh
@@ -5,15 +5,6 @@ set -e
 export BROWSER_STACK_ACCESS_KEY=`echo $BROWSER_STACK_ACCESS_KEY | rev`
 export SAUCE_ACCESS_KEY=`echo $SAUCE_ACCESS_KEY | rev`
 
-DISTTAG=$( cat package.json | jq '.distTag' )
-
-echo $TRAVIS_TAG
-echo $DISTTAG
-
-if [[ $DISTTAG = "next" ]]; then
-  echo "read from json";
-fi
-
 if [ "$JOB" == "ci-checks" ]; then
   grunt ci-checks
 elif [ "$JOB" == "unit" ]; then
@@ -40,6 +31,12 @@ elif [ "$JOB" == "e2e" ]; then
 
   export TARGET_SPECS="test/e2e/tests/**/*.js,$TARGET_SPECS"
   grunt test:travis-protractor --specs="$TARGET_SPECS"
+elif [ "$JOB" == "deploy" ]; then
+  # the DISTTAG is read by the deploy config
+  export DISTTAG=$( cat package.json | jq '.distTag' | tr -d \"[:space:] )
+
+  grunt package
+  grunt compress:firebaseCodeDeploy
 else
-  echo "Unknown job type. Please set JOB=ci-checks, JOB=unit or JOB=e2e-*."
+  echo "Unknown job type. Please set JOB=ci-checks, JOB=unit, JOB=deploy or JOB=e2e-*."
 fi
