From 31e9772cf95e3fcf528f747c621ca149ffa143ff Mon Sep 17 00:00:00 2001 From: bcoe Date: Mon, 9 Aug 2021 08:34:46 -0700 Subject: [PATCH 1/5] fix(build): migrate to using main branch From 356c49df5bbb6a93d122c15bf654f309fb2cdcdd Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Mon, 9 Aug 2021 15:37:01 +0000 Subject: [PATCH 2/5] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/googleapis/repo-automation-bots/blob/master/packages/owl-bot/README.md --- README.md | 12 ++++++------ samples/README.md | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index e4ebebce..2bfcfe53 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Stackdriver Debug Agent for Node.js A comprehensive list of changes in each version may be found in -[the CHANGELOG](https://github.com/googleapis/cloud-debug-nodejs/blob/master/CHANGELOG.md). +[the CHANGELOG](https://github.com/googleapis/cloud-debug-nodejs/blob/main/CHANGELOG.md). * [Stackdriver Debugger Node.js Client API Reference][client-docs] * [Stackdriver Debugger Documentation][product-docs] @@ -58,12 +58,12 @@ npm install @google-cloud/debug-agent ## Samples -Samples are in the [`samples/`](https://github.com/googleapis/cloud-debug-nodejs/tree/master/samples) directory. Each sample's `README.md` has instructions for running its sample. +Samples are in the [`samples/`](https://github.com/googleapis/cloud-debug-nodejs/tree/main/samples) directory. Each sample's `README.md` has instructions for running its sample. | Sample | Source Code | Try it | | --------------------------- | --------------------------------- | ------ | -| App | [source code](https://github.com/googleapis/cloud-debug-nodejs/blob/master/samples/app.js) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/cloud-debug-nodejs&page=editor&open_in_editor=samples/app.js,samples/README.md) | -| Snippets | [source code](https://github.com/googleapis/cloud-debug-nodejs/blob/master/samples/snippets.js) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/cloud-debug-nodejs&page=editor&open_in_editor=samples/snippets.js,samples/README.md) | +| App | [source code](https://github.com/googleapis/cloud-debug-nodejs/blob/main/samples/app.js) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/cloud-debug-nodejs&page=editor&open_in_editor=samples/app.js,samples/README.md) | +| Snippets | [source code](https://github.com/googleapis/cloud-debug-nodejs/blob/main/samples/snippets.js) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/cloud-debug-nodejs&page=editor&open_in_editor=samples/snippets.js,samples/README.md) | @@ -111,7 +111,7 @@ More Information: [Google Cloud Platform Launch Stages][launch_stages] ## Contributing -Contributions welcome! See the [Contributing Guide](https://github.com/googleapis/cloud-debug-nodejs/blob/master/CONTRIBUTING.md). +Contributions welcome! See the [Contributing Guide](https://github.com/googleapis/cloud-debug-nodejs/blob/main/CONTRIBUTING.md). Please note that this `README.md`, the `samples/README.md`, and a variety of configuration files in this repository (including `.nycrc` and `tsconfig.json`) @@ -123,7 +123,7 @@ to its template in this Apache Version 2.0 -See [LICENSE](https://github.com/googleapis/cloud-debug-nodejs/blob/master/LICENSE) +See [LICENSE](https://github.com/googleapis/cloud-debug-nodejs/blob/main/LICENSE) [client-docs]: https://cloud.google.com/nodejs/docs/reference/debug-agent/latest [product-docs]: https://cloud.google.com/debugger diff --git a/samples/README.md b/samples/README.md index 33e97fae..21444bad 100644 --- a/samples/README.md +++ b/samples/README.md @@ -32,7 +32,7 @@ Before running the samples, make sure you've followed the steps outlined in ### App -View the [source code](https://github.com/googleapis/cloud-debug-nodejs/blob/master/samples/app.js). +View the [source code](https://github.com/googleapis/cloud-debug-nodejs/blob/main/samples/app.js). [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/cloud-debug-nodejs&page=editor&open_in_editor=samples/app.js,samples/README.md) @@ -49,7 +49,7 @@ __Usage:__ ### Snippets -View the [source code](https://github.com/googleapis/cloud-debug-nodejs/blob/master/samples/snippets.js). +View the [source code](https://github.com/googleapis/cloud-debug-nodejs/blob/main/samples/snippets.js). [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/cloud-debug-nodejs&page=editor&open_in_editor=samples/snippets.js,samples/README.md) From e390a9faf2eaeb5177836ed79613f5b8c8f5cb0c Mon Sep 17 00:00:00 2001 From: bcoe Date: Mon, 9 Aug 2021 09:08:15 -0700 Subject: [PATCH 3/5] build: fix up a couple broken links in docs --- .github/workflows/ci.yaml | 2 +- src/types/v8.ts | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 891c9253..08027826 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,7 +1,7 @@ on: push: branches: - - master + - main pull_request: name: ci jobs: diff --git a/src/types/v8.ts b/src/types/v8.ts index 2621b8a4..d6321f1d 100644 --- a/src/types/v8.ts +++ b/src/types/v8.ts @@ -15,7 +15,7 @@ // TODO: Determine if the use of snake case should be allowed in this file. /* eslint-disable @typescript-eslint/no-explicit-any */ -// See https://github.com/v8/v8/blob/master/src/debug/mirrors.js +// See https://chromium.googlesource.com/v8/v8.git/+/refs/heads/main/src/inspector/value-mirror.cc export declare type MirrorType = | 'undefined' @@ -133,7 +133,7 @@ export interface PropertyMirror extends Mirror { export interface FrameDetails { // TODO: The debug code expects this to have `arguments` and `locals` fields. - // The code at https://github.com/v8/v8/blob/master/src/debug/mirrors.js + // The code at https://chromium.googlesource.com/v8/v8.git/+/refs/heads/main/src/inspector/value-mirror.cc // seems to suggest that these fields should exist. Make sure that is // the case. arguments: Array<{ @@ -283,8 +283,7 @@ export interface FunctionMirror extends ObjectMirror { context: () => ContextMirror; } -// See https://github.com/v8/v8/blob/master/src/debug/debug.js and -// https://github.com/nodejs/node/blob/master/src/node_contextify.cc +// See https://chromium.googlesource.com/v8/v8.git/+/refs/heads/main/test/debugger/test-api.js export interface ExecutionState { // This interface only contains the elements used within the debug agent // for the full implementation. @@ -323,8 +322,7 @@ export interface DebugEvent { AsyncTaskEvent: DebugEvent; } -// See https://github.com/v8/v8/blob/master/src/debug/debug.js -// TODO: Add the rest of the methods in this interface +// See https://chromium.googlesource.com/v8/v8.git/+/refs/heads/main/test/debugger/test-api.js export interface Debug { DebugEvent: DebugEvent; setListener: (listener: any, opt_data?: any) => void; From 17d537d5fc3d92b3da264d7c89fecdc657c74e16 Mon Sep 17 00:00:00 2001 From: bcoe Date: Mon, 9 Aug 2021 09:28:48 -0700 Subject: [PATCH 4/5] build: update OwlBot sha --- .github/.OwlBot.lock.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 9b2b9550..144aa60c 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-nodejs:latest - digest: sha256:6245a5be4c0406d9b2f04f380d8b88ffe4655df3cdbb57626f8913e8d620f4dd + digest: sha256:72ff93409133b0cf277b8870f859e1ddde62d2e329f655311d4bfc16735d182e From b1a3eac14535e1a460cc6864bdbafdd86c4defda Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Mon, 9 Aug 2021 16:42:36 +0000 Subject: [PATCH 5/5] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/googleapis/repo-automation-bots/blob/master/packages/owl-bot/README.md --- .github/generated-files-bot.yml | 4 ++-- .kokoro/continuous/node10/common.cfg | 2 +- .kokoro/continuous/node10/test.cfg | 2 +- .kokoro/presubmit/node10/common.cfg | 2 +- .kokoro/samples-test.sh | 2 +- .kokoro/system-test.sh | 2 +- .kokoro/test.sh | 2 +- README.md | 6 +++--- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/generated-files-bot.yml b/.github/generated-files-bot.yml index 7bb7ce54..992ccef4 100644 --- a/.github/generated-files-bot.yml +++ b/.github/generated-files-bot.yml @@ -8,9 +8,9 @@ generatedFiles: - path: '.github/generated-files-bot.+(yml|yaml)' message: '`.github/generated-files-bot.(yml|yaml)` should be updated in [`synthtool`](https://github.com/googleapis/synthtool)' - path: 'README.md' - message: '`README.md` is managed by [`synthtool`](https://github.com/googleapis/synthtool). However, a partials file can be used to update the README, e.g.: https://github.com/googleapis/nodejs-storage/blob/master/.readme-partials.yaml' + message: '`README.md` is managed by [`synthtool`](https://github.com/googleapis/synthtool). However, a partials file can be used to update the README, e.g.: https://github.com/googleapis/nodejs-storage/blob/main/.readme-partials.yaml' - path: 'samples/README.md' - message: '`samples/README.md` is managed by [`synthtool`](https://github.com/googleapis/synthtool). However, a partials file can be used to update the README, e.g.: https://github.com/googleapis/nodejs-storage/blob/master/.readme-partials.yaml' + message: '`samples/README.md` is managed by [`synthtool`](https://github.com/googleapis/synthtool). However, a partials file can be used to update the README, e.g.: https://github.com/googleapis/nodejs-storage/blob/main/.readme-partials.yaml' ignoreAuthors: - 'gcf-owl-bot[bot]' - 'yoshi-automation' diff --git a/.kokoro/continuous/node10/common.cfg b/.kokoro/continuous/node10/common.cfg index 73c401b6..1f623d18 100644 --- a/.kokoro/continuous/node10/common.cfg +++ b/.kokoro/continuous/node10/common.cfg @@ -7,7 +7,7 @@ action { } } -# Bring in codecov.io master token into the build as $KOKORO_KEYSTORE_DIR/73713_dpebot_codecov_token +# Bring in codecov.io token into the build as $KOKORO_KEYSTORE_DIR/73713_dpebot_codecov_token before_action { fetch_keystore { keystore_resource { diff --git a/.kokoro/continuous/node10/test.cfg b/.kokoro/continuous/node10/test.cfg index 468b8c71..609c0cf0 100644 --- a/.kokoro/continuous/node10/test.cfg +++ b/.kokoro/continuous/node10/test.cfg @@ -1,4 +1,4 @@ -# Bring in codecov.io master token into the build as $KOKORO_KEYSTORE_DIR/73713_dpebot_codecov_token +# Bring in codecov.io token into the build as $KOKORO_KEYSTORE_DIR/73713_dpebot_codecov_token before_action { fetch_keystore { keystore_resource { diff --git a/.kokoro/presubmit/node10/common.cfg b/.kokoro/presubmit/node10/common.cfg index 73c401b6..1f623d18 100644 --- a/.kokoro/presubmit/node10/common.cfg +++ b/.kokoro/presubmit/node10/common.cfg @@ -7,7 +7,7 @@ action { } } -# Bring in codecov.io master token into the build as $KOKORO_KEYSTORE_DIR/73713_dpebot_codecov_token +# Bring in codecov.io token into the build as $KOKORO_KEYSTORE_DIR/73713_dpebot_codecov_token before_action { fetch_keystore { keystore_resource { diff --git a/.kokoro/samples-test.sh b/.kokoro/samples-test.sh index 950f8483..f249d3e4 100755 --- a/.kokoro/samples-test.sh +++ b/.kokoro/samples-test.sh @@ -39,7 +39,7 @@ if [ -f samples/package.json ]; then npm link ../ npm install cd .. - # If tests are running against master, configure flakybot + # If tests are running against main branch, configure flakybot # to open issues on failures: if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"continuous"* ]] || [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"nightly"* ]]; then export MOCHA_REPORTER_OUTPUT=test_output_sponge_log.xml diff --git a/.kokoro/system-test.sh b/.kokoro/system-test.sh index 319d1e0e..0a840452 100755 --- a/.kokoro/system-test.sh +++ b/.kokoro/system-test.sh @@ -33,7 +33,7 @@ fi npm install -# If tests are running against master, configure flakybot +# If tests are running against main branch, configure flakybot # to open issues on failures: if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"continuous"* ]] || [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"nightly"* ]]; then export MOCHA_REPORTER_OUTPUT=test_output_sponge_log.xml diff --git a/.kokoro/test.sh b/.kokoro/test.sh index b5646aeb..af1ce7e3 100755 --- a/.kokoro/test.sh +++ b/.kokoro/test.sh @@ -21,7 +21,7 @@ export NPM_CONFIG_PREFIX=${HOME}/.npm-global cd $(dirname $0)/.. npm install -# If tests are running against master, configure flakybot +# If tests are running against main branch, configure flakybot # to open issues on failures: if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"continuous"* ]] || [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"nightly"* ]]; then export MOCHA_REPORTER_OUTPUT=test_output_sponge_log.xml diff --git a/README.md b/README.md index 2bfcfe53..ff5981a6 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [![release level](https://img.shields.io/badge/release%20level-beta-yellow.svg?style=flat)](https://cloud.google.com/terms/launch-stages) [![npm version](https://img.shields.io/npm/v/@google-cloud/debug-agent.svg)](https://www.npmjs.org/package/@google-cloud/debug-agent) -[![codecov](https://img.shields.io/codecov/c/github/googleapis/cloud-debug-nodejs/master.svg?style=flat)](https://codecov.io/gh/googleapis/cloud-debug-nodejs) +[![codecov](https://img.shields.io/codecov/c/github/googleapis/cloud-debug-nodejs/main.svg?style=flat)](https://codecov.io/gh/googleapis/cloud-debug-nodejs) @@ -116,8 +116,8 @@ Contributions welcome! See the [Contributing Guide](https://github.com/googleapi Please note that this `README.md`, the `samples/README.md`, and a variety of configuration files in this repository (including `.nycrc` and `tsconfig.json`) are generated from a central template. To edit one of these files, make an edit -to its template in this -[directory](https://github.com/googleapis/synthtool/tree/master/synthtool/gcp/templates/node_library). +to its templates in +[directory](https://github.com/googleapis/synthtool). ## License