Skip to content

Commit adc244e

Browse files
committed
Merge branch 'master' into kokoroDatastore
2 parents e2325fe + fd0bf0e commit adc244e

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

.kokoro/appengine-datastore.sh

+1-8
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,12 @@
1515
# limitations under the License.
1616

1717
export GCLOUD_PROJECT=nodejs-docs-samples-tests
18-
STAGE_BUCKET=$GCLOUD_PROJECT
19-
GCP_REGION=us-central1
2018

2119
export NODE_ENV=development
2220
export GAE_VERSION=appengine-datastore-flexible
2321

2422
# Register post-test cleanup
2523
function cleanup {
26-
CODE=$?
27-
2824
gcloud app versions delete $GAE_VERSION --quiet
2925
if [ -e "worker.yaml" ]; then
3026
gcloud app versions delete ${GAE_VERSION}-worker --quiet
@@ -54,7 +50,4 @@ fi
5450
# Test the deployed app
5551
npm test
5652

57-
# Exit on error
58-
if [[ $CODE -ne 0 ]]; then
59-
exit $CODE
60-
fi
53+
exit $?

appengine/cloudtasks/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Before you can run or deploy the sample, you need to do the following:
3030

3131
1. Refer to the [appengine/README.md][readme] file for instructions on
3232
running and deploying.
33-
1. Enable the Cloud Tasks API in the [Google Cloud Console](https://cloud.google.com/apis/library/cloudtasks.googleapis.com).
33+
1. Enable the Cloud Tasks API in the [Google Cloud Console](https://console.cloud.google.com/apis/api/tasks.googleapis.com).
3434
1. Install dependencies:
3535

3636
With `npm`:

appengine/static-files/app.standard.yaml

+7
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,11 @@
1313

1414
# [START app_yaml]
1515
runtime: nodejs8
16+
17+
handlers:
18+
- url: /static
19+
static_dir: public
20+
21+
- url: /.*
22+
script: auto
1623
# [END app_yaml]

appengine/static-files/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
},
2323
"dependencies": {
2424
"express": "4.16.2",
25-
"pug": "2.0.0"
25+
"pug": "2.0.3"
2626
},
2727
"devDependencies": {
2828
"@google-cloud/nodejs-repo-tools": "2.2.1"

0 commit comments

Comments
 (0)