Skip to content

Commit 67ab4f9

Browse files
authored
chore(java): rename master branch to main (#1221)
1 parent 0752ff7 commit 67ab4f9

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

synthtool/gcp/templates/java_library/.github/blunderbuss.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Configuration for the Blunderbuss GitHub app. For more info see
2-
# https://github.com/googleapis/repo-automation-bots/tree/master/packages/blunderbuss
2+
# https://github.com/googleapis/repo-automation-bots/tree/main/packages/blunderbuss
33
assign_prs_by:
44
- labels:
55
- samples

synthtool/gcp/templates/java_library/.github/sync-repo-settings.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ squashMergeAllowed: true
1111
# Defaults to `false`
1212
mergeCommitAllowed: false
1313

14-
# Rules for master branch protection
14+
# Rules for main branch protection
1515
branchProtectionRules:
1616
# Identifies the protection rule pattern. Name of the branch to be protected.
17-
# Defaults to `master`
18-
- pattern: master
17+
# Defaults to `main`
18+
- pattern: main
1919
# Can admins overwrite branch protection.
2020
# Defaults to `true`
2121
isAdminEnforced: true

synthtool/gcp/templates/java_library/.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
on:
22
push:
33
branches:
4-
- master
4+
- main
55
pull_request:
66
name: ci
77
jobs:

synthtool/gcp/templates/java_library/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,11 @@ use this {{metadata['repo']['name_pretty']}} Client Library.
107107
{% if metadata['samples']|length %}
108108
## Samples
109109

110-
Samples are in the [`samples/`](https://github.com/{{ metadata['repo']['repo'] }}/tree/master/samples) directory.
110+
Samples are in the [`samples/`](https://github.com/{{ metadata['repo']['repo'] }}/tree/main/samples) directory.
111111

112112
| Sample | Source Code | Try it |
113113
| --------------------------- | --------------------------------- | ------ |
114-
{% for sample in metadata['samples'] %}| {{ sample.title }} | [source code](https://github.com/{{ metadata['repo']['repo'] }}/blob/master/{{ sample.file }}) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/{{ metadata['repo']['repo'] }}&page=editor&open_in_editor={{ sample.file }}) |
114+
{% for sample in metadata['samples'] %}| {{ sample.title }} | [source code](https://github.com/{{ metadata['repo']['repo'] }}/blob/main/{{ sample.file }}) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/{{ metadata['repo']['repo'] }}&page=editor&open_in_editor={{ sample.file }}) |
115115
{% endfor %}
116116
{% endif %}
117117

@@ -239,10 +239,10 @@ Java is a registered trademark of Oracle and/or its affiliates.
239239
[developer-console]: https://console.developers.google.com/
240240
[create-project]: https://cloud.google.com/resource-manager/docs/creating-managing-projects
241241
[cloud-sdk]: https://cloud.google.com/sdk/
242-
[troubleshooting]: https://github.com/googleapis/google-cloud-common/blob/master/troubleshooting/readme.md#troubleshooting
243-
[contributing]: https://github.com/{{metadata['repo']['repo']}}/blob/master/CONTRIBUTING.md
244-
[code-of-conduct]: https://github.com/{{metadata['repo']['repo']}}/blob/master/CODE_OF_CONDUCT.md#contributor-code-of-conduct
245-
[license]: https://github.com/{{metadata['repo']['repo']}}/blob/master/LICENSE
242+
[troubleshooting]: https://github.com/googleapis/google-cloud-common/blob/main/troubleshooting/readme.md#troubleshooting
243+
[contributing]: https://github.com/{{metadata['repo']['repo']}}/blob/main/CONTRIBUTING.md
244+
[code-of-conduct]: https://github.com/{{metadata['repo']['repo']}}/blob/main/CODE_OF_CONDUCT.md#contributor-code-of-conduct
245+
[license]: https://github.com/{{metadata['repo']['repo']}}/blob/main/LICENSE
246246
{% if metadata['repo']['requires_billing'] %}[enable-billing]: https://cloud.google.com/apis/docs/getting-started#enabling_billing{% endif %}
247247
{% if metadata['repo']['api_id'] %}[enable-api]: https://console.cloud.google.com/flows/enableapi?apiid={{ metadata['repo']['api_id'] }}{% endif %}
248248
[libraries-bom]: https://github.com/GoogleCloudPlatform/cloud-opensource-java/wiki/The-Google-Cloud-Platform-Libraries-BOM

0 commit comments

Comments
 (0)