Skip to content

Commit

Permalink
Rename master branch to main (#3202)
Browse files Browse the repository at this point in the history
  • Loading branch information
ssbarnea authored Aug 2, 2021
1 parent d0cb7b7 commit 386f5af
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
name: Bug report
about: Please test the master branch before raising bugs.
about: Please test the main branch before raising bugs.
labels: bug
---
<!--- Verify first that your issue is not already reported on GitHub -->
<!--- Do not report bugs before reproducing them with the code of the master branch! -->
<!--- Do not report bugs before reproducing them with the code of the main branch! -->
<!--- Please also check https://molecule.readthedocs.io/en/latest/faq.html --->
<!--- Please use https://groups.google.com/forum/#!forum/molecule-users for usage questions -->

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ on:
push:
# branches to consider in the event; optional, defaults to all
branches:
- master
- main
- 'releases/**'
- 'stable/**'

jobs:
update_release_draft:
runs-on: ubuntu-20.04
steps:
# Drafts your next Release notes as Pull Requests are merged into "master"
# Drafts your next Release notes as Pull Requests are merged into "main"
- uses: release-drafter/release-drafter@v5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/tox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
tags: # any tag regardless of its name, no branches
push: # only publishes pushes to the main branch to TestPyPI
branches: # any integration branch but not tag
- "master"
- "main"
tags-ignore:
- "**"
pull_request:
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ License

The `MIT`_ License.

.. _`MIT`: https://github.com/ansible-community/molecule/blob/master/LICENSE
.. _`MIT`: https://github.com/ansible-community/molecule/blob/main/LICENSE

The logo is licensed under the `Creative Commons NoDerivatives 4.0 License`_.

Expand Down
2 changes: 1 addition & 1 deletion docs/ci.rst
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ Azure Pipelines
---
trigger:
- master
- main
pool:
vmImage: ubuntu-16.04
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
'display_github': 'True',
'github_user': 'ansible-community',
'github_repo': 'molecule',
'github_version': 'master/docs/',
'github_version': 'main/docs/',
'current_version': version,
'latest_version': 'latest',
# list specifically out of order to make latest work
Expand Down
6 changes: 3 additions & 3 deletions docs/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -43,20 +43,20 @@ Guidelines
* Submit a pull request.

.. _`Issue`: https://github.com/ansible-community/molecule/issues/new/choose
.. _`DCO 1.1`: https://github.com/ansible-community/molecule/blob/master/DCO_1_1.md
.. _`DCO 1.1`: https://github.com/ansible-community/molecule/blob/main/DCO_1_1.md

Code Of Conduct
===============

Please see our `Code of Conduct`_ document.

.. _Code of Conduct: https://github.com/ansible-community/molecule/blob/master/.github/CODE_OF_CONDUCT.md
.. _Code of Conduct: https://github.com/ansible-community/molecule/blob/main/.github/CODE_OF_CONDUCT.md

Pull Request Life Cycle and Governance
======================================

* If your PRs get stuck `join us on IRC`_ or add to the `working group agenda`_.
* The code style is what is enforced by CI, everything else is off topic.
* The code style is what is enforced by CI, everything else is off-topic.
* All PRs must be reviewed by one other person. This is enforced by GitHub. Larger changes require +2.

.. _working group agenda: https://github.com/ansible/community/wiki/Molecule#meetings
Expand Down

0 comments on commit 386f5af

Please sign in to comment.