From a8974e2110f20e48c61a31358cb305c4a86bf2bd Mon Sep 17 00:00:00 2001
From: Silvano Luciani <silvano.luciani@gmail.com>
Date: Wed, 17 Sep 2014 11:39:30 -0700
Subject: [PATCH] chore(build): run regression tests from travis

Run regression tests from travis after merging to master (encrypted
files are not available for pull requests from forks).
Remove environment variables from .travis.yml if favor of per-repo
configuration on travis UI.
Temporarily remove docs generation from build.
---
 .travis.yml      |  34 +++++++---------------------------
 key.json.enc     | Bin 0 -> 1264 bytes
 scripts/merge.sh |  22 ++++++++++++++++++++++
 3 files changed, 29 insertions(+), 27 deletions(-)
 create mode 100644 key.json.enc
 create mode 100755 scripts/merge.sh

diff --git a/.travis.yml b/.travis.yml
index c1e17b12c62..0d56ab19b20 100644
--- a/.travis.yml
+++ b/.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
diff --git a/key.json.enc b/key.json.enc
new file mode 100644
index 0000000000000000000000000000000000000000..1d98517f4d9f981bf93165382ef4873517e5df2e
GIT binary patch
literal 1264
zcmV<M1P}XjlFQYg@gFJ%yWptapCNdW*gJy_&bS&PEiM@a6cvteR3ni;j|%Y5lD^yv
zOo929`(bu*19sG!kvw`|cCcp`$<9J+jmBcV-t*w(RuIUIfz;{6P)$K@f1?$=5S_%_
z9`fR?`+)SxL<la6?tb{yRod!9VY0cS4)ZoDYf*W-dH#8o8oa%$b8;xpbH65RgyRm@
z1#Ow!!$eG-g+8%r`vafy<Dzq!I^6=FWM2!&%sKq}nk$h-!1Ym>aOBA!W5`LJVo^D5
zV$~!b$9gCk5MggxEJfe-S7pNB`_Pt=jv3B(<89JwA8%V01d6F+cTgvNUnmPqc3!M?
zzQEnrZ?a7$v9F^_sy$ZDwh6?xrfRM2GaK~4R?-{v<2SGc&zS~%^Jf=N#MnpqtmL7N
z_42?k<emrx%3K^J6u_dR6g?*G%D?onY%(2A1-DavxCK|PrLQz>)@vofB?dc!g+zT7
zGm#SF=9S8q3E_&Jd|XyqnY!B6Xe7INDby{pQO*>)6#@UTL`@~^c6{L#YG|ki4mDRA
zQunPh#6BtmnC`KT@-Hz3X0jv?D6QN1Dv#~s&Fop)2Z+lW(w(N38UqlmL)W579NQc8
z*?Q(Q!x$s}`1SOHMhn~}jCB^Uiy`v$kw9rV0D7`wS>sm~$%h6|`v4=z0%{U$x@tF7
z(ocCDV@Vrk&Mps$oitF8515)OyEB>u;2k*(v2dB1V1Uw{mU(#2AK=;T!{YmYf!n6}
zfAK(4>mW*MRwH^0D3yOI-d~<hTwpXA4Sn|70lrIfh8AmIoDwsx8U2%9M#rE&y%e%l
zB_9dGCrBesLrF_c-yCa7eSit|$Gf6EUN>ap+mlkFt|@e+`;M>OvL(J6<M6ES&vnbw
z3NhMin_8zfyhdv7<>abAKgzdUtElC7mFzh2zr%#&nAD^xHA21fUS%tw568)JW7pcd
z2DCbT0nXt10GWNjtIGzY^x&BH-0mSg+C$Zj=1GON`j5PO{Jj9^ez`_L)>@3Rfk?JH
z9PkI!DR>P#cmkh)8<=UPRV>1@qi(1>Uj6E-qVlWDr#G0GqWH2tBEFR`M937&iX8Pr
z758icA}DljO;71r9us!mt^p^GB2JLce~#RUcoo7VJhjhuP-4I?%~7+Rtv~`_;!hZi
zKq4(>)aB1T#UyMtk2!w+6Y!_<t)MZ~ci!rf%Ujg>Co3+Xc}}dwkh@<Y;|rcuE!Qau
zb5NB15tjwqk@DMkXIbDczi@WTK28eM!k^P}0k2^|Biqm?76CT-3fVoY!iJ`k$%Y&G
zKms;My_l$(YuSv`FdA8Xd;RDmq8T%De$Zf~Kr!Y9cWs)pG|u0e103_BNB)pj2t6qZ
zV|i-g@rGPtg<MKxFx(nUX};DfIOE+Q7%}v1I>KR?1dJduy4me3bbknilZ-KXm+*2I
z{F-;xmOVt#{j~mr#tDgQOovegJ=l6f(8Q+mW5=9#_C#t~a}IhnA#&6*i|4g7?Scqp
zCLbp{BnskKb}H_w%5>FoID>#<dO5u9;kuL(6Qhb+uR3oB)M@j&%HZ!=5i~RJ;->8B
z&k|6mxs)NZ0Ld5qUVqQ1gakCU%t8pqGj|J0LD2>%WkvpfH+eM0`(3&B+-*pFx$`tG
a{0${kOHY0CHQIK^-1F^5mqH^^@ie}qo^%ud

literal 0
HcmV?d00001

diff --git a/scripts/merge.sh b/scripts/merge.sh
new file mode 100755
index 00000000000..66b2f4d52ce
--- /dev/null
+++ b/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