Merge pull request googleapis#217 from silvolu/regression-keys

chore(build): run regression tests from travis

.travis.yml

@@ -1,29 +1,9 @@
-language:
-  node_js
+language: node_js
 node_js:
-  - 0.10
-branches:
-  only:
-    - master
-env:
-  global:
-    - secure: "a9Qx7y7dIWXEdppdmPW5g6CJQpUWUmd3sKWcJPKMfcg+xVHEBhPl9PCt/2jGK1sxstTDiwrVaV1NKpG4qD03UVot2zX28o1mM7JY6rDAl709rvKveegDeC9vo+U/BWid3lq/Impl37X0YYGY+spEcptI6bnvWxa6d7MGPCx3L2c="
-    - GH_OWNER: GoogleCloudPlatform
-    - GH_PROJECT_NAME: gcloud-node
+- 0.10
+before_install:
+- openssl aes-256-cbc -K $encrypted_b8aa0887832a_key -iv $encrypted_b8aa0887832a_iv -in key.json.enc -out key.json -d
 script:
-  - npm run lint
-  - npm run test
-after_success:
-  - git submodule add -b master https://${GH_OAUTH_TOKEN}@github.com/${GH_OWNER}/${GH_PROJECT_NAME} master > /dev/null 2>&1
-  - cd master
-  - npm install
-  - npm run docs
-  - git submodule add -b gh-pages https://${GH_OAUTH_TOKEN}@github.com/${GH_OWNER}/${GH_PROJECT_NAME} ghpages > /dev/null 2>&1
-  - cd ghpages
-  - git rm -r .
-  - cp -R ../docs/* .
-  - git add -f .
-  - git config user.email "sawchuk@gmail.com"
-  - git config user.name "stephenplusplus"
-  - git commit -am "building gh-pages [ci skip]"
-  - git push https://${GH_OAUTH_TOKEN}@github.com/${GH_OWNER}/${GH_PROJECT_NAME} HEAD:gh-pages > /dev/null 2>&1
+- npm run lint
+- npm run test
+after_success: ./scripts/merge.sh

scripts/merge.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# Copyright 2014 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -ev
+
+# if merging to master and not a pull request, execute regression tests and update docs
+if [ "${TRAVIS_BRANCH}" == "master" ] && [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
+  npm run regression-test
+fi