Skip to content

Commit

Permalink
chore: migrate to main branch (#706)
Browse files Browse the repository at this point in the history
* chore: migrate to main branch

* 🦉 Updates from OwlBot

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* use latest post processor image

* remove obsolete replacements in owlbot.py

* update post processor image

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
Co-authored-by: Anthonios Partheniou <partheniou@google.com>
  • Loading branch information
3 people authored Sep 2, 2021
1 parent 4643876 commit 9d9d360
Show file tree
Hide file tree
Showing 14 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions .github/.OwlBot.lock.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
# https://developers.google.com/open-source/licenses/bsd

docker:
image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
digest: sha256:82d046d572a11b84d64d4b9af93ad55a1b6a4854917504ba7557acdfce907dde
image: gcr.io/repo-automation-bots/owlbot-python:latest
digest: sha256:0ffe3bdd6c7159692df5f7744da74e5ef19966288a6bf76023e8e04e0c424d7d
2 changes: 1 addition & 1 deletion .github/workflows/django_tests_against_emulator0.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
on:
push:
branches:
- master
- main
pull_request:
name: django-tests0
jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/django_tests_against_emulator1.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
on:
push:
branches:
- master
- main
pull_request:
name: django-tests1
jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/django_tests_against_emulator2.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
on:
push:
branches:
- master
- main
pull_request:
name: django-tests2
jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/django_tests_against_emulator3.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
on:
push:
branches:
- master
- main
pull_request:
name: django-tests3
jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/django_tests_against_emulator4.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
on:
push:
branches:
- master
- main
pull_request:
name: django-tests4
jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/django_tests_against_emulator5.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
on:
push:
branches:
- master
- main
pull_request:
name: django-tests5
jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/django_tests_against_emulator6.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
on:
push:
branches:
- master
- main
pull_request:
name: django-tests6
jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/django_tests_against_emulator7.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
on:
push:
branches:
- master
- main
pull_request:
name: django-tests7
jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/django_tests_against_emulator8.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
on:
push:
branches:
- master
- main
pull_request:
name: django-tests8
jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/django_tests_against_emulator9.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
on:
push:
branches:
- master
- main
pull_request:
name: django-tests9
jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration-tests-against-emulator.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
on:
push:
branches:
- master
- main
pull_request:
name: Run Django Spanner integration tests against emulator
jobs:
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/test-samples-impl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ for file in samples/**/requirements.txt; do
EXIT=$?

# If this is a periodic build, send the test log to the FlakyBot.
# See https://github.com/googleapis/repo-automation-bots/tree/master/packages/flakybot.
# See https://github.com/googleapis/repo-automation-bots/tree/main/packages/flakybot.
if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"periodic"* ]]; then
chmod +x $KOKORO_GFILE_DIR/linux_amd64/flakybot
$KOKORO_GFILE_DIR/linux_amd64/flakybot
Expand Down
8 changes: 4 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -220,13 +220,13 @@ How it works
Overall design
~~~~~~~~~~~~~~

.. figure:: https://raw.githubusercontent.com/googleapis/python-spanner-django/master/assets/overview.png
.. figure:: https://raw.githubusercontent.com/googleapis/python-spanner-django/main/assets/overview.png
:alt: "Overall Design"

Internals
~~~~~~~~~

.. figure:: https://raw.githubusercontent.com/googleapis/python-spanner-django/master/assets/internals.png
.. figure:: https://raw.githubusercontent.com/googleapis/python-spanner-django/main/assets/internals.png
:alt: "Internals"


Expand All @@ -247,11 +247,11 @@ HOW TO CONTRIBUTE

Contributions to this library are always welcome and highly encouraged.

See `CONTRIBUTING <https://github.com/googleapis/python-spanner-django/blob/master/CONTRIBUTING.md>`_ for more information on how to get started.
See `CONTRIBUTING <https://github.com/googleapis/python-spanner-django/blob/main/CONTRIBUTING.md>`_ for more information on how to get started.

Please note that this project is released with a Contributor Code of Conduct.
By participating in this project you agree to abide by its terms. See the `Code
of Conduct <https://github.com/googleapis/python-spanner-django/blob/master/CODE_OF_CONDUCT.md>`_ for more information.
of Conduct <https://github.com/googleapis/python-spanner-django/blob/main/CODE_OF_CONDUCT.md>`_ for more information.

Current limitations
-------------------
Expand Down

0 comments on commit 9d9d360

Please sign in to comment.