Skip to content

Commit fdc7aaa

Browse files
chore: migrate to main branch (#226)
* chore: migrate to main branch * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent 62aad70 commit fdc7aaa

File tree

5 files changed

+40
-11
lines changed

5 files changed

+40
-11
lines changed

.github/sync-repo-settings.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ squashMergeAllowed: true
1010
# Defaults to `false`
1111
mergeCommitAllowed: false
1212

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

.kokoro/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ python3 -m pip install --upgrade --quiet nox
4141
python3 -m nox --version
4242

4343
# If this is a continuous build, send the test log to the FlakyBot.
44-
# See https://github.com/googleapis/repo-automation-bots/tree/master/packages/flakybot.
44+
# See https://github.com/googleapis/repo-automation-bots/tree/main/packages/flakybot.
4545
if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"continuous"* ]]; then
4646
cleanup() {
4747
chmod +x $KOKORO_GFILE_DIR/linux_amd64/flakybot

.kokoro/test-samples-impl.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ for file in samples/**/requirements.txt; do
8080
EXIT=$?
8181

8282
# If this is a periodic build, send the test log to the FlakyBot.
83-
# See https://github.com/googleapis/repo-automation-bots/tree/master/packages/flakybot.
83+
# See https://github.com/googleapis/repo-automation-bots/tree/main/packages/flakybot.
8484
if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"periodic"* ]]; then
8585
chmod +x $KOKORO_GFILE_DIR/linux_amd64/flakybot
8686
$KOKORO_GFILE_DIR/linux_amd64/flakybot

CONTRIBUTING.rst

+6-6
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ You'll have to create a development environment using a Git checkout:
5050
# Configure remotes such that you can pull changes from the googleapis/python-pubsublite
5151
# repository into your local repository.
5252
$ git remote add upstream [email protected]:googleapis/python-pubsublite.git
53-
# fetch and merge changes from upstream into master
53+
# fetch and merge changes from upstream into main
5454
$ git fetch upstream
55-
$ git merge upstream/master
55+
$ git merge upstream/main
5656

5757
Now your local repo is set up such that you will push changes to your GitHub
5858
repo, from which you can submit a pull request.
@@ -110,12 +110,12 @@ Coding Style
110110
variables::
111111

112112
export GOOGLE_CLOUD_TESTING_REMOTE="upstream"
113-
export GOOGLE_CLOUD_TESTING_BRANCH="master"
113+
export GOOGLE_CLOUD_TESTING_BRANCH="main"
114114

115115
By doing this, you are specifying the location of the most up-to-date
116116
version of ``python-pubsublite``. The the suggested remote name ``upstream``
117117
should point to the official ``googleapis`` checkout and the
118-
the branch should be the main branch on that remote (``master``).
118+
the branch should be the main branch on that remote (``main``).
119119

120120
- This repository contains configuration for the
121121
`pre-commit <https://pre-commit.com/>`__ tool, which automates checking
@@ -209,7 +209,7 @@ The `description on PyPI`_ for the project comes directly from the
209209
``README``. Due to the reStructuredText (``rst``) parser used by
210210
PyPI, relative links which will work on GitHub (e.g. ``CONTRIBUTING.rst``
211211
instead of
212-
``https://github.com/googleapis/python-pubsublite/blob/master/CONTRIBUTING.rst``)
212+
``https://github.com/googleapis/python-pubsublite/blob/main/CONTRIBUTING.rst``)
213213
may cause problems creating links or rendering the description.
214214

215215
.. _description on PyPI: https://pypi.org/project/google-cloud-pubsublite
@@ -234,7 +234,7 @@ We support:
234234

235235
Supported versions can be found in our ``noxfile.py`` `config`_.
236236

237-
.. _config: https://github.com/googleapis/python-pubsublite/blob/master/noxfile.py
237+
.. _config: https://github.com/googleapis/python-pubsublite/blob/main/noxfile.py
238238

239239

240240
We also explicitly decided to support Python 3 beginning with version 3.6.

owlbot.py

+29
Original file line numberDiff line numberDiff line change
@@ -80,3 +80,32 @@
8080

8181

8282
s.shell.run(["nox", "-s", "blacken"], hide_output=False)
83+
84+
# ----------------------------------------------------------------------------
85+
# Main Branch migration
86+
# ----------------------------------------------------------------------------
87+
88+
s.replace(
89+
"*.rst",
90+
"master",
91+
"main"
92+
)
93+
94+
s.replace(
95+
"*.rst",
96+
"google-cloud-python/blob/main",
97+
"google-cloud-python/blob/master"
98+
)
99+
100+
s.replace(
101+
"CONTRIBUTING.rst",
102+
"kubernetes/community/blob/main",
103+
"kubernetes/community/blob/master"
104+
)
105+
106+
s.replace(
107+
".kokoro/*",
108+
"master",
109+
"main"
110+
)
111+

0 commit comments

Comments
 (0)