Skip to content

Commit

Permalink
Update references to the main branch (#1695)
Browse files Browse the repository at this point in the history
* Update references to the main branch

* changelog

---------

Co-authored-by: Timo Stollenwerk <tisto@users.noreply.github.com>
  • Loading branch information
davisagli and tisto committed Aug 25, 2023
1 parent a132711 commit eb85bf6
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/update_remote_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Trigger build and deploy of Plone 6 documentation
on:
push:
branches:
- "master"
- "main"
paths:
- "docs/*"

Expand Down
6 changes: 3 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
.. image:: https://github.com/plone/plone.restapi/actions/workflows/tests.yml/badge.svg?branch=master
.. image:: https://github.com/plone/plone.restapi/actions/workflows/tests.yml/badge.svg?branch=main
:target: https://github.com/plone/plone.restapi/actions/workflows/tests.yml

.. image:: https://coveralls.io/repos/github/plone/plone.restapi/badge.svg?branch=master
:target: https://coveralls.io/github/plone/plone.restapi?branch=master
.. image:: https://coveralls.io/repos/github/plone/plone.restapi/badge.svg?branch=main
:target: https://coveralls.io/github/plone/plone.restapi?branch=main

.. image:: https://readthedocs.org/projects/pip/badge
:target: https://plonerestapi.readthedocs.io/en/latest/
Expand Down
2 changes: 1 addition & 1 deletion base.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ interpreter = sphinxPython
recipe = collective.recipe.template
input = inline:
#!/bin/bash
git push heroku master
git push heroku main
output = ${buildout:directory}/bin/deploy-to-heroku
mode = 755

Expand Down
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ def patch_pygments_to_highlight_jsonschema():
# Options for the linkcheck builder
# Ignore localhost
linkcheck_ignore = [
r"https://coveralls.io/repos/github/plone/plone.restapi/badge.svg\?branch=master", # plone.restapi
r"https://coveralls.io/repos/github/plone/plone.restapi/badge.svg\?branch=main", # plone.restapi
r"https://github.com/plone/plone.restapi/blob/dde57b88e0f1b5f5e9f04e6a21865bc0dde55b1c/src/plone/restapi/services/content/add.py#L35-L61", # plone.restapi
r"https://vhs-ehrenamtsportal.de/", # cert fix in progress
]
Expand Down
2 changes: 1 addition & 1 deletion docs/source/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ myst:
"keywords": "Plone, plone.restapi, REST, API"
---

% plone.restapi documentation master file, created by
% plone.restapi documentation index file, created by
% sphinx-quickstart on Mon Apr 28 13:04:12 2014.
% You can adapt this file completely to your liking, but it should at least
% contain the root `toctree` directive.
Expand Down
1 change: 1 addition & 0 deletions news/1695.breaking
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
The default branch was renamed from `master` to `main`. @tisto, @davisagli

0 comments on commit eb85bf6

Please sign in to comment.