From 876eea97b076231391a39ef095511ef9285aab4e Mon Sep 17 00:00:00 2001 From: "Benjamin E. Coe" Date: Mon, 17 Jun 2019 17:39:32 -0700 Subject: [PATCH 1/3] fix(build): switch to using GitHub magic proxy (#29) --- .kokoro/continuous/node10/test.cfg | 22 ++++++++++++++++++++-- .kokoro/test.sh | 13 +++++++------ synth.metadata | 10 +++++----- 3 files changed, 32 insertions(+), 13 deletions(-) diff --git a/.kokoro/continuous/node10/test.cfg b/.kokoro/continuous/node10/test.cfg index 38c174e..fefee48 100644 --- a/.kokoro/continuous/node10/test.cfg +++ b/.kokoro/continuous/node10/test.cfg @@ -8,12 +8,30 @@ before_action { } } -# token used by release-please to keep an up-to-date release PR. +# tokens used by release-please to keep an up-to-date release PR. before_action { fetch_keystore { keystore_resource { keystore_config_id: 73713 - keyname: "yoshi-automation-github-key" + keyname: "github-magic-proxy-key-release-please" + } + } +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "github-magic-proxy-token-release-please" + } + } +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "github-magic-proxy-url-release-please" } } } diff --git a/.kokoro/test.sh b/.kokoro/test.sh index c9057f6..0aa16ce 100755 --- a/.kokoro/test.sh +++ b/.kokoro/test.sh @@ -36,10 +36,11 @@ else echo "coverage is only reported for Node $COVERAGE_NODE" fi -# if the GITHUB_TOKEN is set, we kick off a task to update the release-PR. -GITHUB_TOKEN=$(cat $KOKORO_KEYSTORE_DIR/73713_yoshi-automation-github-key) || true -if [ "$GITHUB_TOKEN" ]; then - npx release-please release-pr --token=$GITHUB_TOKEN \ - --repo-url=googleapis/nodejs-web-risk \ - --package-name=@google-cloud/web-risk +# if release-please keys set, we kick off a task to update the release-PR. +if [ -f ${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-url-release-please ]; then + npx release-please release-pr --token=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-token-release-please \ + --repo-url=googleapis/release-please \ + --package-name=release-please \ + --api-url=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-url-release-please \ + --proxy-key=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-key-release-please fi diff --git a/synth.metadata b/synth.metadata index b26143b..d6109d7 100644 --- a/synth.metadata +++ b/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-06-12T11:27:13.917263Z", + "updateTime": "2019-06-18T00:26:19.984372Z", "sources": [ { "generator": { "name": "artman", - "version": "0.24.1", - "dockerImage": "googleapis/artman@sha256:6018498e15310260dc9b03c9d576608908ed9fbabe42e1494ff3d827fea27b19" + "version": "0.26.0", + "dockerImage": "googleapis/artman@sha256:6db0735b0d3beec5b887153a2a7c7411fc7bb53f73f6f389a822096bd14a3a15" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "f117dac435e96ebe58d85280a3faf2350c4d4219", - "internalRef": "252714985" + "sha": "384aa843867c4d17756d14a01f047b6368494d32", + "internalRef": "253675319" } }, { From 785ae03c7a0ac413c7c18b8e3a284a81cabff296 Mon Sep 17 00:00:00 2001 From: "Benjamin E. Coe" Date: Mon, 17 Jun 2019 18:03:48 -0700 Subject: [PATCH 2/3] build: that was silly, should be @google-cloud/web-risk (#30) --- .kokoro/test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.kokoro/test.sh b/.kokoro/test.sh index 0aa16ce..74c35fb 100755 --- a/.kokoro/test.sh +++ b/.kokoro/test.sh @@ -39,8 +39,8 @@ fi # if release-please keys set, we kick off a task to update the release-PR. if [ -f ${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-url-release-please ]; then npx release-please release-pr --token=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-token-release-please \ - --repo-url=googleapis/release-please \ - --package-name=release-please \ + --repo-url=googleapis/nodejs-web-risk \ + --package-name=@google-cloud/web-risk \ --api-url=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-url-release-please \ --proxy-key=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-key-release-please fi From c0c3305dbba68faba2deb6bfcfdad4609965c0ca Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 24 Jun 2019 08:33:55 -0700 Subject: [PATCH 3/3] chore: release 1.1.2 (#34) * updated CHANGELOG.md [ci skip] * updated package.json [ci skip] * updated samples/package.json [ci skip] --- CHANGELOG.md | 7 +++++++ package.json | 2 +- samples/package.json | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dee108f..2c43891 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/web-risk?activeTab=versions +### [1.1.2](https://www.github.com/googleapis/nodejs-web-risk/compare/v1.1.1...v1.1.2) (2019-06-24) + + +### Bug Fixes + +* **build:** switch to using GitHub magic proxy ([#29](https://www.github.com/googleapis/nodejs-web-risk/issues/29)) ([876eea9](https://www.github.com/googleapis/nodejs-web-risk/commit/876eea9)) + ### [1.1.1](https://www.github.com/googleapis/nodejs-web-risk/compare/v1.1.0...v1.1.1) (2019-06-15) diff --git a/package.json b/package.json index 73d3d83..a333777 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "repository": "googleapis/nodejs-web-risk", "name": "@google-cloud/web-risk", - "version": "1.1.1", + "version": "1.1.2", "author": "Google LLC", "description": "Web Risk API client for Node.js", "main": "src/index.js", diff --git a/samples/package.json b/samples/package.json index ca0b57a..5e9ad02 100644 --- a/samples/package.json +++ b/samples/package.json @@ -13,7 +13,7 @@ "test": "mocha --timeout 600000 system-test/*.js" }, "dependencies": { - "@google-cloud/web-risk": "^1.1.1" + "@google-cloud/web-risk": "^1.1.2" }, "devDependencies": { "chai": "^4.2.0",