Skip to content

Commit e45c4d6

Browse files
authored
Master -> Main (#1313)
* Conditionally publish stable * Master to main changes * Revert "Conditionally publish stable" This reverts commit 6a4685b.
1 parent f850ed5 commit e45c4d6

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

.github/workflows/CI.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ jobs:
3737
runs-on: ubuntu-latest
3838
steps:
3939
- uses: actions/checkout@v2
40-
- name: Checkout master
40+
- name: Checkout main
4141
run: |
42-
git fetch origin master --depth=1
42+
git fetch origin main --depth=1
4343
- uses: actions/setup-python@v2
4444
with:
4545
python-version: 3.7
@@ -85,9 +85,9 @@ jobs:
8585
runs-on: ubuntu-latest
8686
steps:
8787
- uses: actions/checkout@v2
88-
- name: Checkout master
88+
- name: Checkout main
8989
run: |
90-
git fetch origin master --depth=1
90+
git fetch origin main --depth=1
9191
- uses: actions/setup-python@v2
9292
with:
9393
python-version: 3.7

.github/workflows/base-branch.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ jobs:
1414
with:
1515
repo-token: ${{ secrets.GITHUB_TOKEN }}
1616
protected-branches: stable
17-
default-branch: master
17+
default-branch: main
1818
update-branch: true

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ The website is available under the following domains, it is preferred to use the
1111
- https://frc-docs.readthedocs.io/en/latest/
1212

1313
# WPILib Mission
14-
The WPILib Mission is to enable FIRST Robotics teams to focus on writing game-specific software rather than focusing on hardware details - "raise the floor, don't lower the ceiling". We work to enable teams with limited programming knowledge and/or mentor experience to be as successful as possible, while not hampering the abilities of teams with more advanced programming capabilities. We support Kit of Parts control system components directly in the library. We also strive to keep parity between major features of each language (Java, C++, and NI's LabVIEW), so that teams aren't at a disadvantage for choosing a specific programming language. WPILib is an open source project, licensed under the BSD 3-clause license. You can find a copy of the license [here](https://github.com/wpilibsuite/allwpilib/blob/master/LICENSE.txt).
14+
The WPILib Mission is to enable FIRST Robotics teams to focus on writing game-specific software rather than focusing on hardware details - "raise the floor, don't lower the ceiling". We work to enable teams with limited programming knowledge and/or mentor experience to be as successful as possible, while not hampering the abilities of teams with more advanced programming capabilities. We support Kit of Parts control system components directly in the library. We also strive to keep parity between major features of each language (Java, C++, and NI's LabVIEW), so that teams aren't at a disadvantage for choosing a specific programming language. WPILib is an open source project, licensed under the BSD 3-clause license. You can find a copy of the license [here](https://github.com/wpilibsuite/allwpilib/blob/main/LICENSE.txt).
1515

1616
# Contributing to frc-docs
1717

1818
We're happy to have you contributing to frc-docs, whether it's; writing articles, fixing code, new extensions, or adding translations!
1919

20-
All the information needed to contribute to frc-docs is located in the [contributing](https://docs.wpilib.org/en/latest/docs/contributing/frc-docs/index.html) section on frc-docs. Additionally, please ensure that all contributions follow the WPILib [Code of Conduct](https://github.com/wpilibsuite/allwpilib/blob/master/CODE_OF_CONDUCT.md).
20+
All the information needed to contribute to frc-docs is located in the [contributing](https://docs.wpilib.org/en/latest/docs/contributing/frc-docs/index.html) section on frc-docs. Additionally, please ensure that all contributions follow the WPILib [Code of Conduct](https://github.com/wpilibsuite/allwpilib/blob/main/CODE_OF_CONDUCT.md).

source/conf.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
versionwarning_body_selector = 'div[class="document"]'
6363

6464
# Redirect branch
65-
rediraffe_branch = "origin/master"
65+
rediraffe_branch = "origin/main"
6666

6767
# File containing redirects
6868
rediraffe_redirects = "redirects.txt"
@@ -71,13 +71,13 @@
7171
rediraffe_auto_redirect_perc = 80
7272

7373
# Configure linkcheck diff branch
74-
linkcheckdiff_branch = "origin/master"
74+
linkcheckdiff_branch = "origin/main"
7575

7676
# Configure OpenGraph support
7777
ogp_site_url = "https://docs.wpilib.org/en/latest/"
7878
ogp_site_name = "FIRST Robotics Competition Documentation"
7979
ogp_image = (
80-
"https://raw.githubusercontent.com/wpilibsuite/branding/master/png/wpilib-128.png"
80+
"https://raw.githubusercontent.com/wpilibsuite/branding/main/png/wpilib-128.png"
8181
)
8282

8383
# Enables ChiefDelphi support

source/docs/contributing/frc-docs/contribution-guidelines.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Release Process
2626
frc-docs uses a special release process for handling the main site ``/stable/`` and the development site ``/latest/``. This flow is detailed below.
2727

2828
During Season:
29-
- Commit made to ``master`` branch
29+
- Commit made to ``main`` branch
3030

3131
- Updates ``/stable/`` and ``/latest/`` on the website
3232

@@ -35,14 +35,14 @@ End of Season:
3535

3636
Off-Season:
3737
- ``stable`` branch is locked to the last on-season commit
38-
- Commit made to ``master`` branch
38+
- Commit made to ``main`` branch
3939

4040
- Only updates ``/latest/`` on the documentation site
4141

4242
Creating a PR
4343
-------------
4444

45-
PRs should be made to the `frc-docs <https://github.com/wpilibsuite/frc-docs>`__ repo on GitHub. They should point to the ``master`` branch and *not* ``stable``.
45+
PRs should be made to the `frc-docs <https://github.com/wpilibsuite/frc-docs>`__ repo on GitHub. They should point to the ``main`` branch and *not* ``stable``.
4646

4747
Creating New Content
4848
--------------------

0 commit comments

Comments
 (0)