Merge branch 'master' into runRepoTools

GoogleCloudPlatform · Jun 5, 2018 · 1b40540 · 1b40540
2 parents a09aafa + a2268f4
commit 1b40540
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/appengine/hello-world/flexible/package.json b/appengine/hello-world/flexible/package.json
@@ -22,10 +22,11 @@
     "e2e-test": "repo-tools test deploy"
   },
   "dependencies": {
-    "express": "4.16.2"
+    "express": "^4.16.3"
   },
   "devDependencies": {
-    "@google-cloud/nodejs-repo-tools": "2.2.1"
+    "@google-cloud/nodejs-repo-tools": "^2.3.0",
+    "semistandard": "^12.0.1"
   },
   "cloud-repo-tools": {
     "test": {

diff --git a/appengine/hello-world/standard/package.json b/appengine/hello-world/standard/package.json
@@ -15,17 +15,18 @@
   "scripts": {
     "deploy": "gcloud app deploy",
     "start": "node app.js",
-    "lint": "samples lint",
+    "lint": "repo-tools lint",
     "pretest": "npm run lint",
-    "system-test": "samples test app",
+    "system-test": "repo-tools test app",
     "test": "npm run system-test",
-    "e2e-test": "samples test deploy"
+    "e2e-test": "repo-tools test deploy"
   },
   "dependencies": {
-    "express": "4.16.2"
+    "express": "^4.16.3"
   },
   "devDependencies": {
-    "@google-cloud/nodejs-repo-tools": "2.2.1"
+    "@google-cloud/nodejs-repo-tools": "^2.3.0",
+    "semistandard": "^12.0.1"
   },
   "cloud-repo-tools": {
     "test": {

diff --git a/circle.yml b/circle.yml
@@ -99,7 +99,8 @@ deployment:
       - node scripts/build "appengine/datastore"
       - node scripts/build "appengine/endpoints"
       - node scripts/build "appengine/errorreporting"
-      - node scripts/build "appengine/hello-world"
+      - node scripts/build "appengine/flexible/hello-world"
+      - node scripts/build "appengine/standard/hello-world"
       - node scripts/build "appengine/mailjet"
       - node scripts/build "appengine/metadata/flexible"
       - node scripts/build "appengine/metadata/standard"