Merge branch 'master' into kokoroDatastore

GoogleCloudPlatform · Jun 6, 2018 · adc244e · adc244e
2 parents e2325fe + fd0bf0e
commit adc244e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/.kokoro/appengine-datastore.sh b/.kokoro/appengine-datastore.sh
@@ -15,16 +15,12 @@
 # limitations under the License.
 
 export GCLOUD_PROJECT=nodejs-docs-samples-tests
-STAGE_BUCKET=$GCLOUD_PROJECT
-GCP_REGION=us-central1
 
 export NODE_ENV=development
 export GAE_VERSION=appengine-datastore-flexible
 
 # Register post-test cleanup
 function cleanup {
-  CODE=$?
-
   gcloud app versions delete $GAE_VERSION --quiet
   if [ -e "worker.yaml" ]; then
     gcloud app versions delete ${GAE_VERSION}-worker --quiet
@@ -54,7 +50,4 @@ fi
 # Test the deployed app
 npm test
 
-# Exit on error
-if [[ $CODE -ne 0 ]]; then
-  exit $CODE
-fi
+exit $?
diff --git a/appengine/cloudtasks/README.md b/appengine/cloudtasks/README.md
@@ -30,7 +30,7 @@ Before you can run or deploy the sample, you need to do the following:
 
 1.  Refer to the [appengine/README.md][readme] file for instructions on
     running and deploying.
-1.  Enable the Cloud Tasks API in the [Google Cloud Console](https://cloud.google.com/apis/library/cloudtasks.googleapis.com).
+1.  Enable the Cloud Tasks API in the [Google Cloud Console](https://console.cloud.google.com/apis/api/tasks.googleapis.com).
 1.  Install dependencies:
 
     With `npm`:

diff --git a/appengine/static-files/app.standard.yaml b/appengine/static-files/app.standard.yaml
@@ -13,4 +13,11 @@
 
 # [START app_yaml]
 runtime: nodejs8
+
+handlers:
+  - url: /static
+    static_dir: public
+
+  - url: /.*
+    script: auto
 # [END app_yaml]
diff --git a/appengine/static-files/package.json b/appengine/static-files/package.json
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "express": "4.16.2",
-    "pug": "2.0.0"
+    "pug": "2.0.3"
   },
   "devDependencies": {
     "@google-cloud/nodejs-repo-tools": "2.2.1"