Merge branch 'master' into ava-to-mocha

googleapis · Nov 6, 2018 · 34fb3d9 · 34fb3d9
2 parents 2b2d3f8 + 80d63ef
commit 34fb3d9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -159,7 +159,8 @@ jobs:
           command: npm run system-test
           environment:
             GCLOUD_PROJECT: long-door-651
-            GOOGLE_APPLICATION_CREDENTIALS: .circleci/key.json
+            GOOGLE_APPLICATION_CREDENTIALS: /home/node/project/.circleci/key.json
+            NPM_CONFIG_PREFIX: /home/node/.npm-global
       - run:
           name: Remove unencrypted key.
           command: |

diff --git a/.eslintignore b/.eslintignore
@@ -1,3 +1,4 @@
 node_modules/*
 samples/node_modules/*
 src/**/doc/*
+build/