Skip to content
This repository has been archived by the owner on Jul 13, 2023. It is now read-only.

fix(build): migrate to using main branch #523

Merged
merged 2 commits into from
Aug 13, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/.OwlBot.lock.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
docker:
image: gcr.io/repo-automation-bots/owlbot-nodejs:latest
digest: sha256:06c970a44680229c1e8cefa701dbc93b80468ec4a34e6968475084e4ec1e2d7d
digest: sha256:72ff93409133b0cf277b8870f859e1ddde62d2e329f655311d4bfc16735d182e
4 changes: 2 additions & 2 deletions .github/auto-approve.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ rules:
- "CHANGELOG\\.md$"
maxFiles: 3
- author: "renovate-bot"
title: "^(fix\\(deps\\)|chore\\(deps\\)):"
title: "^(fix|chore)\\(deps\\):"
changedFiles:
- "/package\\.json$"
- "package\\.json$"
maxFiles: 2
4 changes: 2 additions & 2 deletions .github/generated-files-bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
on:
push:
branches:
- master
- main
pull_request:
name: ci
jobs:
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/continuous/node10/common.cfg

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .kokoro/continuous/node10/test.cfg

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .kokoro/presubmit/node10/common.cfg

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .kokoro/samples-test.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .kokoro/system-test.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .kokoro/test.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

[![release level](https://img.shields.io/badge/release%20level-general%20availability%20%28GA%29-brightgreen.svg?style=flat)](https://cloud.google.com/terms/launch-stages)
[![npm version](https://img.shields.io/npm/v/@google-cloud/dataproc.svg)](https://www.npmjs.org/package/@google-cloud/dataproc)
[![codecov](https://img.shields.io/codecov/c/github/googleapis/nodejs-dataproc/master.svg?style=flat)](https://codecov.io/gh/googleapis/nodejs-dataproc)
[![codecov](https://img.shields.io/codecov/c/github/googleapis/nodejs-dataproc/main.svg?style=flat)](https://codecov.io/gh/googleapis/nodejs-dataproc)



Expand All @@ -15,7 +15,7 @@ Google Cloud Dataproc API client for Node.js


A comprehensive list of changes in each version may be found in
[the CHANGELOG](https://github.com/googleapis/nodejs-dataproc/blob/master/CHANGELOG.md).
[the CHANGELOG](https://github.com/googleapis/nodejs-dataproc/blob/main/CHANGELOG.md).

* [Google Cloud Dataproc Node.js Client API Reference][client-docs]
* [Google Cloud Dataproc Documentation][product-docs]
Expand Down Expand Up @@ -173,14 +173,14 @@ main(...args);

## Samples

Samples are in the [`samples/`](https://github.com/googleapis/nodejs-dataproc/tree/master/samples) directory. Each sample's `README.md` has instructions for running its sample.
Samples are in the [`samples/`](https://github.com/googleapis/nodejs-dataproc/tree/main/samples) directory. Each sample's `README.md` has instructions for running its sample.

| Sample | Source Code | Try it |
| --------------------------- | --------------------------------- | ------ |
| Create Cluster | [source code](https://github.com/googleapis/nodejs-dataproc/blob/master/samples/createCluster.js) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/nodejs-dataproc&page=editor&open_in_editor=samples/createCluster.js,samples/README.md) |
| Instantiate an inline workflow template | [source code](https://github.com/googleapis/nodejs-dataproc/blob/master/samples/instantiateInlineWorkflowTemplate.js) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/nodejs-dataproc&page=editor&open_in_editor=samples/instantiateInlineWorkflowTemplate.js,samples/README.md) |
| Quickstart | [source code](https://github.com/googleapis/nodejs-dataproc/blob/master/samples/quickstart.js) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/nodejs-dataproc&page=editor&open_in_editor=samples/quickstart.js,samples/README.md) |
| Submit Job | [source code](https://github.com/googleapis/nodejs-dataproc/blob/master/samples/submitJob.js) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/nodejs-dataproc&page=editor&open_in_editor=samples/submitJob.js,samples/README.md) |
| Create Cluster | [source code](https://github.com/googleapis/nodejs-dataproc/blob/main/samples/createCluster.js) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/nodejs-dataproc&page=editor&open_in_editor=samples/createCluster.js,samples/README.md) |
| Instantiate an inline workflow template | [source code](https://github.com/googleapis/nodejs-dataproc/blob/main/samples/instantiateInlineWorkflowTemplate.js) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/nodejs-dataproc&page=editor&open_in_editor=samples/instantiateInlineWorkflowTemplate.js,samples/README.md) |
| Quickstart | [source code](https://github.com/googleapis/nodejs-dataproc/blob/main/samples/quickstart.js) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/nodejs-dataproc&page=editor&open_in_editor=samples/quickstart.js,samples/README.md) |
| Submit Job | [source code](https://github.com/googleapis/nodejs-dataproc/blob/main/samples/submitJob.js) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/nodejs-dataproc&page=editor&open_in_editor=samples/submitJob.js,samples/README.md) |



Expand Down Expand Up @@ -229,19 +229,19 @@ More Information: [Google Cloud Platform Launch Stages][launch_stages]

## Contributing

Contributions welcome! See the [Contributing Guide](https://github.com/googleapis/nodejs-dataproc/blob/master/CONTRIBUTING.md).
Contributions welcome! See the [Contributing Guide](https://github.com/googleapis/nodejs-dataproc/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`)
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

Apache Version 2.0

See [LICENSE](https://github.com/googleapis/nodejs-dataproc/blob/master/LICENSE)
See [LICENSE](https://github.com/googleapis/nodejs-dataproc/blob/main/LICENSE)

[client-docs]: https://cloud.google.com/nodejs/docs/reference/dataproc/latest
[product-docs]: https://cloud.google.com/dataproc
Expand Down
8 changes: 4 additions & 4 deletions samples/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Before running the samples, make sure you've followed the steps outlined in

### Create Cluster

View the [source code](https://github.com/googleapis/nodejs-dataproc/blob/master/samples/createCluster.js).
View the [source code](https://github.com/googleapis/nodejs-dataproc/blob/main/samples/createCluster.js).

[![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/nodejs-dataproc&page=editor&open_in_editor=samples/createCluster.js,samples/README.md)

Expand All @@ -51,7 +51,7 @@ __Usage:__

### Instantiate an inline workflow template

View the [source code](https://github.com/googleapis/nodejs-dataproc/blob/master/samples/instantiateInlineWorkflowTemplate.js).
View the [source code](https://github.com/googleapis/nodejs-dataproc/blob/main/samples/instantiateInlineWorkflowTemplate.js).

[![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/nodejs-dataproc&page=editor&open_in_editor=samples/instantiateInlineWorkflowTemplate.js,samples/README.md)

Expand All @@ -68,7 +68,7 @@ __Usage:__

### Quickstart

View the [source code](https://github.com/googleapis/nodejs-dataproc/blob/master/samples/quickstart.js).
View the [source code](https://github.com/googleapis/nodejs-dataproc/blob/main/samples/quickstart.js).

[![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/nodejs-dataproc&page=editor&open_in_editor=samples/quickstart.js,samples/README.md)

Expand All @@ -85,7 +85,7 @@ __Usage:__

### Submit Job

View the [source code](https://github.com/googleapis/nodejs-dataproc/blob/master/samples/submitJob.js).
View the [source code](https://github.com/googleapis/nodejs-dataproc/blob/main/samples/submitJob.js).

[![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/nodejs-dataproc&page=editor&open_in_editor=samples/submitJob.js,samples/README.md)

Expand Down