test

Narretz · Narretz · commit 9a87d428d30b · 2017-07-08T00:16:24.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -48,9 +48,16 @@ notifications:
 jobs:
   include:
     - stage: deploy
+      env:
+        - JOB=deploy
+        - DIST_TAG=""
       before_script: skip
-      # Work around the 10min Travis timeout. The firebase / gcs code deploy does not report
-      # back to the process
+      script:
+       - "./scripts/travis/build.sh"
+       - echo $SAUCE_ACCESS_KEY
+       - echo $DIST_TAG
+       - echo $TRAVIS_TAG
+      # Work around the 10min Travis timeout so the firebase / gcs code deploy can complete
       before_deploy: |
         function keep_alive() {
           while true; do
@@ -59,16 +66,14 @@ jobs:
           done
         }
         keep_alive &
-      env:
-        - JOB=deploy
       deploy:
         - provider: firebase
           skip_cleanup: true
           token:
             secure: $FIREBASE_TOKEN
           on:
             repo: angular/angular.js
-            condition: $TRAVIS_TAG = '' && $DISTTAG = next
+            condition: $TRAVIS_TAG = '' && $( jq ".distTag" "package.json" | tr -d "\"[:space:]" ) = next
             all_branches: true
         - provider: gcs
           access_key_id: GOOGLDB7W2J3LFHICF3R
diff --git a/scripts/travis/build.sh b/scripts/travis/build.sh
@@ -16,9 +16,9 @@ case "$JOB" in
       BROWSERS="SL_Chrome,SL_Firefox,SL_Safari_8,SL_Safari_9,SL_IE_9,SL_IE_10,SL_IE_11,SL_EDGE,SL_iOS"
     fi
 
-    grunt test:promises-aplus
-    grunt test:unit --browsers="$BROWSERS" --reporters=dots
-    grunt tests:docs --browsers="$BROWSERS" --reporters=dots
+    # grunt test:promises-aplus
+    # grunt test:unit --browsers="$BROWSERS" --reporters=dots
+    # grunt tests:docs --browsers="$BROWSERS" --reporters=dots
     ;;
   "docs-e2e")
     grunt test:travis-protractor --specs="docs/app/e2e/**/*.scenario.js"
@@ -38,11 +38,13 @@ case "$JOB" in
     grunt test:travis-protractor --specs="$TARGET_SPECS"
     ;;
   "deploy")
-    # the DISTTAG is read by the deploy config
-    export DISTTAG=$( cmd < package.json | jq '.distTag' | tr -d \"[:space:] )
+    # the DIST_TAG is read by the deploy config
+    DIST_TAG=$( jq ".distTag" "package.json" | tr -d "\"[:space:]" )
+    export DIST_TAG
 
-    echo 'DISTTAG?'
-    echo $DISTTAG
+    echo "DIST_TAG: $DIST_TAG"
+
+    export DIST_TAG="next"
 
     grunt package
     grunt compress:firebaseCodeDeploy
