Merge master into throwdown

googleapis · Oct 2, 2018 · 333e090 · 333e090
2 parents a37aa12 + b118061
commit 333e090
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 7 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -68,8 +68,6 @@ jobs:
           environment:
             NPM_CONFIG_PREFIX: /home/node/.npm-global
       - run: npm test
-      - run: node_modules/.bin/codecov
-
   node8:
     docker:
       - image: 'node:8'

diff --git a/.kokoro/common.cfg b/.kokoro/common.cfg
@@ -13,6 +13,17 @@ gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
 # Use the trampoline script to run in docker.
 build_file: "nodejs-vision/.kokoro/trampoline.sh"
 
+# Bring in codecov.io master token into the build as $KOKORO_KEYSTORE_DIR/73713_dpebot_codecov_token
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 73713
+      keyname: "dpebot_codecov_token"
+      backend_type: FASTCONFIGPUSH
+    }
+  }
+}
+
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
     key: "TRAMPOLINE_IMAGE"

diff --git a/.kokoro/samples-test.sh b/.kokoro/samples-test.sh
@@ -26,7 +26,9 @@ cd $(dirname $0)/..
 
 # Run a pre-test hook, if a pre-samples-test.sh is in the project
 if [ -f .kokoro/pre-samples-test.sh ]; then
+    set +x
     . .kokoro/pre-samples-test.sh
+    set -x
 fi
 
 npm install

diff --git a/.kokoro/system-test.sh b/.kokoro/system-test.sh
@@ -26,7 +26,9 @@ cd $(dirname $0)/..
 
 # Run a pre-test hook, if a pre-system-test.sh is in the project
 if [ -f .kokoro/pre-system-test.sh ]; then
+    set +x
     . .kokoro/pre-system-test.sh
+    set -x
 fi
 
 npm install

diff --git a/.kokoro/test.bat b/.kokoro/test.bat
@@ -17,6 +17,8 @@
 cd /d %~dp0
 cd ..
 
+call npm install -g npm@5 || goto :error
+
 call npm install || goto :error
 call npm run test || goto :error
 

diff --git a/.kokoro/test.sh b/.kokoro/test.sh
@@ -22,4 +22,5 @@ cd $(dirname $0)/..
 
 npm install
 npm test
-node_modules/.bin/codecov
+
+bash $KOKORO_GFILE_DIR/codecov.sh
diff --git a/codecov.yaml b/codecov.yaml
@@ -0,0 +1,4 @@
+---
+codecov:
+  ci:
+    - source.cloud.google.com
diff --git a/package.json b/package.json
@@ -80,7 +80,7 @@
     "eslint": "^5.0.1",
     "eslint-config-prettier": "^3.0.0",
     "eslint-plugin-node": "^7.0.0",
-    "eslint-plugin-prettier": "^2.6.1",
+    "eslint-plugin-prettier": "^3.0.0",
     "ink-docstrap": "^1.3.2",
     "intelli-espower-loader": "^1.0.1",
     "jsdoc": "^3.5.5",

diff --git a/samples/automl/automlVisionDataset.js b/samples/automl/automlVisionDataset.js
@@ -293,7 +293,7 @@ function deleteDataset(projectId, computeRegion, datasetId) {
   // [END automl_vision_delete_dataset]
 }
 
-require(`yargs`)  // eslint-disable-line
+require(`yargs`) // eslint-disable-line
   .demand(1)
   .options({
     computeRegion: {

diff --git a/samples/automl/automlVisionModel.js b/samples/automl/automlVisionModel.js
@@ -488,7 +488,7 @@ function deleteModel(projectId, computeRegion, modelId) {
   // [END automl_vision_delete_model]
 }
 
-require(`yargs`)  // eslint-disable-line
+require(`yargs`) // eslint-disable-line
   .demand(1)
   .options({
     computeRegion: {

diff --git a/samples/automl/automlVisionPredict.js b/samples/automl/automlVisionPredict.js
@@ -73,7 +73,7 @@ function predict(projectId, computeRegion, modelId, filePath, scoreThreshold) {
   // [END automl_vision_predict]
 }
 
-require(`yargs`)  // eslint-disable-line
+require(`yargs`) // eslint-disable-line
   .demand(1)
   .options({
     computeRegion: {