fix(presubmit): Set new token; correct env variable name

Author: mhevery

.travis.yml

@@ -13,7 +13,7 @@ env:
     TESTS=dart2js
   global:
   - CHROME_BIN=/usr/bin/google-chrome
-  - secure: NJt0LRmY2HoMw4QuTc+8MhDfSCTTuXe0kE7pC1flbhQOi/g6sdVX57b/4OZzBXRKG1oq/URX4FMeVgSuFQvTaEad0qsTPoGji/Mmk61LRtE/Mbo/H7v5P2tyGPPJ5S25C/xFo42cKDyzFU8Uv+5W2Htijsa3xt4VfAWcDmZJjuA=
+  - secure: "ZSUCLuDjvKEFmgjAd3GpUNCNkdjE66dEIiBfW+EfN0dv2+QHx/MHL4hRyKk2qbGjCr/suR9JWgmNE+Yu1A4fwzcYN52ehgyoLUCTL9YDk+XkFdFWpnjJ8364TDcDuJA0oxwcqJ9E3XUPv6sq1mbcX6DlkPKco7ZT8TLtGmd0nGA="
 before_install:
 - export DISPLAY=:99.0
 - ./scripts/travis/install.sh

scripts/travis/presubmit.sh

@@ -12,15 +12,14 @@ echo Current branch is: $TRAVIS_BRANCH
 echo Test result is: $TRAVIS_TEST_RESULT
 
 if [ "$CHANNEL" = "stable" ] && [ "$TRAVIS_REPO_SLUG" = "angular/angular.dart" ]; then
-     
-    if [ $TRAVIS_TEST_RESULT -eq 0 ] && [[ $TRAVIS_BRANCH == "presubmit-"* ]]; then
-     
-        git config credential.helper "store --file=.git/credentials"
-        echo "https://${GITHUB_TOKEN_ANGULARDART}:@github.com" > .git/credentials
-        git config user.name "travis@travis-ci.org"
- 
-        echo "Pushing HEAD to master..."
-        git remote add upstream https://github.com/angular/angular.dart.git
-        git push upstream HEAD:master
-    fi
+  if [ $TRAVIS_TEST_RESULT -eq 0 ] && [[ $TRAVIS_BRANCH == "presubmit-"* ]]; then
+    git config credential.helper "store --file=.git/credentials"
+    # travis encrypt GITHUB_TOKEN_ANGULAR_ORG=??? --repo=angular/angular.dart
+    echo "https://${GITHUB_TOKEN_ANGULAR_ORG}:@github.com" > .git/credentials
+    git config user.name "travis@travis-ci.org"
+
+    echo "Pushing HEAD to master..."
+    git remote add upstream https://github.com/angular/angular.dart.git
+    git push upstream HEAD:master
+  fi
 fi

scripts/travis/publish-docs.sh

@@ -8,30 +8,29 @@ echo Current branch is: $TRAVIS_BRANCH
 echo Test result is: $TRAVIS_TEST_RESULT
 
 if [ "$CHANNEL" = "stable" ] && [ "$TRAVIS_REPO_SLUG" = "angular/angular.dart" ]; then
-
-    if [ $TRAVIS_TEST_RESULT -eq 0 ] && [ "$TRAVIS_BRANCH" = "master" ]; then
-
-            echo "Gettting current docs from docs.angulardart.org repo on Github"
-            rm -Rf docs.angulardart.org
-            git clone https://github.com/angular/docs.angulardart.org.git
-
-            echo "Removing old stable docs..."
-            rm -rf docs.angulardart.org/docs
-
-            echo "Copying new docs into stable folder..."
-            rsync -a dartdoc-viewer/client/build/web/* docs.angulardart.org/
-            cd docs.angulardart.org/
-
-            #.git folder needs to be in the *project* root
-            git config credential.helper "store --file=.git/credentials"
-            echo "https://${GITHUB_TOKEN_DOCS_ANGULARDART_ORG}:@github.com" > .git/credentials
-            git config user.name "travis@travis-ci.org"
-
-            echo "Adding files..."
-            git add .
-            git commit -m "Automated push of generated docs from SHA: https://github.com/angular/angular.dart/commit/$SHA"
-            git push
-    fi
+  if [ $TRAVIS_TEST_RESULT -eq 0 ] && [ "$TRAVIS_BRANCH" = "master" ]; then
+    echo "Gettting current docs from docs.angulardart.org repo on Github"
+    rm -Rf docs.angulardart.org
+    git clone https://github.com/angular/docs.angulardart.org.git
+
+    echo "Removing old stable docs..."
+    rm -rf docs.angulardart.org/docs
+
+    echo "Copying new docs into stable folder..."
+    rsync -a dartdoc-viewer/client/build/web/* docs.angulardart.org/
+    cd docs.angulardart.org/
+
+    #.git folder needs to be in the *project* root
+    git config credential.helper "store --file=.git/credentials"
+    # travis encrypt GITHUB_TOKEN_ANGULAR_ORG=??? --repo=angular/angular.dart
+    echo "https://${GITHUB_TOKEN_ANGULAR_ORG}:@github.com" > .git/credentials
+    git config user.name "travis@travis-ci.org"
+
+    echo "Adding files..."
+    git add .
+    git commit -m "Automated push of generated docs from SHA: https://github.com/angular/angular.dart/commit/$SHA"
+    git push
+  fi
 fi