From 3e1556b8bb32595c0affae0a70e0ddaa559f22d8 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Tue, 10 May 2022 10:39:45 -0700 Subject: [PATCH 1/4] feat!: Update library to use Node 12 --- .kokoro/continuous/node10/common.cfg | 34 ---------------------------- .kokoro/continuous/node10/docs.cfg | 4 ---- .kokoro/continuous/node10/test.cfg | 9 -------- .kokoro/presubmit/node10/common.cfg | 34 ---------------------------- package.json | 8 +++---- samples/package.json | 4 ++-- 6 files changed, 6 insertions(+), 87 deletions(-) delete mode 100644 .kokoro/continuous/node10/common.cfg delete mode 100644 .kokoro/continuous/node10/docs.cfg delete mode 100644 .kokoro/continuous/node10/test.cfg delete mode 100644 .kokoro/presubmit/node10/common.cfg diff --git a/.kokoro/continuous/node10/common.cfg b/.kokoro/continuous/node10/common.cfg deleted file mode 100644 index 141ad49..0000000 --- a/.kokoro/continuous/node10/common.cfg +++ /dev/null @@ -1,34 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Build logs will be here -action { - define_artifacts { - regex: "**/*sponge_log.xml" - } -} - -# Bring in codecov.io 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" - } - } -} - -# Download trampoline resources. -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" - -# Use the trampoline script to run in docker. -build_file: "nodejs-workflows/.kokoro/trampoline_v2.sh" - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:10-user" -} -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-workflows/.kokoro/test.sh" -} diff --git a/.kokoro/continuous/node10/docs.cfg b/.kokoro/continuous/node10/docs.cfg deleted file mode 100644 index a66c873..0000000 --- a/.kokoro/continuous/node10/docs.cfg +++ /dev/null @@ -1,4 +0,0 @@ -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-workflows/.kokoro/docs.sh" -} diff --git a/.kokoro/continuous/node10/test.cfg b/.kokoro/continuous/node10/test.cfg deleted file mode 100644 index 609c0cf..0000000 --- a/.kokoro/continuous/node10/test.cfg +++ /dev/null @@ -1,9 +0,0 @@ -# Bring in codecov.io 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" - } - } -} diff --git a/.kokoro/presubmit/node10/common.cfg b/.kokoro/presubmit/node10/common.cfg deleted file mode 100644 index 141ad49..0000000 --- a/.kokoro/presubmit/node10/common.cfg +++ /dev/null @@ -1,34 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Build logs will be here -action { - define_artifacts { - regex: "**/*sponge_log.xml" - } -} - -# Bring in codecov.io 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" - } - } -} - -# Download trampoline resources. -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" - -# Use the trampoline script to run in docker. -build_file: "nodejs-workflows/.kokoro/trampoline_v2.sh" - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:10-user" -} -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-workflows/.kokoro/test.sh" -} diff --git a/package.json b/package.json index 6e8dd5e..c1bbe96 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "pretest": "npm run prepare" }, "dependencies": { - "google-gax": "^2.24.1" + "google-gax": "^3.0.0" }, "devDependencies": { "@types/mocha": "^9.0.0", @@ -52,16 +52,16 @@ "jsdoc-fresh": "^1.0.2", "jsdoc-region-tag": "^1.0.4", "linkinator": "^2.1.2", - "mocha": "^8.1.2", + "mocha": "^9.2.2", "null-loader": "^4.0.0", "pack-n-play": "^1.0.0-2", "sinon": "^14.0.0", "ts-loader": "^9.0.0", - "typescript": "^3.9.7", + "typescript": "^4.6.4", "webpack": "^5.0.0", "webpack-cli": "^4.0.0" }, "engines": { - "node": ">=10.0.0" + "node": ">=12.0.0" } } diff --git a/samples/package.json b/samples/package.json index 4896f44..6b12918 100644 --- a/samples/package.json +++ b/samples/package.json @@ -4,7 +4,7 @@ "license": "Apache-2.0", "author": "Google LLC", "engines": { - "node": ">=10" + "node": ">=12.0.0" }, "files": [ "*.js" @@ -19,4 +19,4 @@ "c8": "^7.3.0", "mocha": "^8.1.1" } -} +} \ No newline at end of file From abc60396ddd829680a070fc37a3c51a0ba0e2912 Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Tue, 10 May 2022 17:41:26 +0000 Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot=20po?= =?UTF-8?q?st-processor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --- .github/sync-repo-settings.yaml | 2 +- .github/workflows/ci.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 1b36268..d1e8b5e 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -9,9 +9,9 @@ branchProtectionRules: - "ci/kokoro: System test" - docs - lint - - test (10) - test (12) - test (14) + - test (16) - cla/google - windows - OwlBot Post Processor diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 25251db..f447b84 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node: [10, 12, 14] + node: [12, 14, 16] steps: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 From 59b1565b270cca6964c3788bd2131e27c6d704cd Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Tue, 10 May 2022 15:41:05 -0700 Subject: [PATCH 3/4] update gts --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c1bbe96..38e7c66 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "@types/node": "^16.0.0", "@types/sinon": "^10.0.0", "c8": "^7.3.0", - "gts": "^2.0.2", + "gts": "^3.1.0", "jsdoc": "^3.6.5", "jsdoc-fresh": "^1.0.2", "jsdoc-region-tag": "^1.0.4", From 165b213670c14de912f8d148be581038f600d6f7 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Mon, 16 May 2022 14:25:05 -0700 Subject: [PATCH 4/4] dep: update google-gax --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 38e7c66..25fbaa0 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "pretest": "npm run prepare" }, "dependencies": { - "google-gax": "^3.0.0" + "google-gax": "^3.0.1" }, "devDependencies": { "@types/mocha": "^9.0.0",