Skip to content

Commit a31018d

Browse files
authored
Update parent repository primary branch name from "master" to "main". (#304)
1 parent 75e0c36 commit a31018d

File tree

4 files changed

+74
-74
lines changed

4 files changed

+74
-74
lines changed

.github/CONTRIBUTING.md

Lines changed: 70 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,70 @@
1-
# Contribution guidelines
2-
3-
Thank you for your interest in contributing to our project. Whether it's a bug report, new feature, code, or
4-
documentation, we welcome our community to be involved in this project.
5-
6-
Please read through this document before submitting any issues or pull requests to ensure we are able to help you and all members of the community as effectively as possible.
7-
8-
## Code of conduct
9-
This project has adopted the [Amazon Open Source Code of Conduct](https://aws.github.io/code-of-conduct).
10-
For more information see the [Code of Conduct FAQ](https://aws.github.io/code-of-conduct-faq) or contact
11-
opensource-codeofconduct@amazon.com with any additional questions or comments.
12-
13-
14-
## Security issue notifications
15-
If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our [vulnerability reporting page](https://aws.amazon.com/security/vulnerability-reporting/). Please do **not** create a public github issue.
16-
17-
18-
## Submitting a bugs/feature request
19-
Have a bug to report or feature to request? Follow these steps:
20-
1. Search on the [FreeRTOS Community Support Forums](https://forums.freertos.org/) and [GitHub issue tracker](https://github.com/FreeRTOS/FreeRTOS/issues?utf8=%E2%9C%93&q=is%3Aissue) to be sure this hasn't been already reported or discussed.
21-
2. If your search turns up empty, create a new topic in the [forums](https://forums.freertos.org/) and work with the community to help clarify issues or refine the idea. Include as many of the details listed below.
22-
3. Once the community has had time to discuss and digest, we welcome you to create an [issue](https://github.com/FreeRTOS/FreeRTOS/issues) to report bugs or suggest features.
23-
24-
When creating a new topic on the forums or filing an issue, please include as many relevant details as possible. Examples include:
25-
26-
* A clear description of the situation — what you observe, what you expect, and your view on how the two differ.
27-
* A reproducible test case or sequence of steps.
28-
* The version of our code being used.
29-
* Any modifications you've made relevant to the bug.
30-
* Details of your environment or deployment. Highlight anything unusual.
31-
32-
33-
## Contributing via pull request
34-
Contributions via pull requests are much appreciated. Before sending us a pull request, please ensure that:
35-
36-
1. You are working against the latest source on the *master* branch.
37-
2. You check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem already.
38-
3. You open an issue to discuss any significant work - we would hate for your time to be wasted.
39-
40-
To send us a pull request, please:
41-
42-
1. Fork the repository.
43-
2. Modify the source; focus on the specific change you are contributing. If you also reformat all the code, it will be hard for us to focus on your change.
44-
3. Follow the [coding style guide](https://www.FreeRTOS.org/FreeRTOS-Coding-Standard-and-Style-Guide.html).
45-
4. Commit to your fork using clear commit messages.
46-
5. Send us a pull request, answering any default questions in the pull request interface.
47-
NOTE: Please make sure the default option (Allow edits from maintainers) is left checked.
48-
6. Pay attention to any automated CI failures reported in the pull request, and stay involved in the conversation.
49-
50-
GitHub provides additional document on [forking a repository](https://help.github.com/articles/fork-a-repo/) and
51-
[creating a pull request](https://help.github.com/articles/creating-a-pull-request/).
52-
53-
## Coding style
54-
* Please ensure that your code complies to the [FreeRTOS coding style guidelines](https://www.FreeRTOS.org/FreeRTOS-Coding-Standard-and-Style-Guide.html).
55-
56-
57-
## Getting your pull request merged
58-
All pull requests must be approved by our review team before it can be merged in. We appreciate your patience while pull requests are reviewed. The time it takes to review will depend on complexity and consideration of wider implications.
59-
60-
61-
## Finding contributions to work on
62-
Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels (enhancement/bug/duplicate/help wanted/invalid/question/wontfix), tackling open 'help wanted' issues is a great place to start.
63-
64-
65-
## Licensing
66-
The FreeRTOS kernel is released under the MIT open source license, the text of which can be found [here](https://github.com/FreeRTOS/FreeRTOS/blob/master/FreeRTOS/License/license.txt)
67-
68-
Additional license files can be found in the folders containing any supplementary libraries licensed by their respective copyright owners where applicable.
69-
70-
We may ask you to sign a [Contributor License Agreement (CLA)](https://en.wikipedia.org/wiki/Contributor_License_Agreement) for larger changes.
1+
# Contribution guidelines
2+
3+
Thank you for your interest in contributing to our project. Whether it's a bug report, new feature, code, or
4+
documentation, we welcome our community to be involved in this project.
5+
6+
Please read through this document before submitting any issues or pull requests to ensure we are able to help you and all members of the community as effectively as possible.
7+
8+
## Code of conduct
9+
This project has adopted the [Amazon Open Source Code of Conduct](https://aws.github.io/code-of-conduct).
10+
For more information see the [Code of Conduct FAQ](https://aws.github.io/code-of-conduct-faq) or contact
11+
opensource-codeofconduct@amazon.com with any additional questions or comments.
12+
13+
14+
## Security issue notifications
15+
If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our [vulnerability reporting page](https://aws.amazon.com/security/vulnerability-reporting/). Please do **not** create a public github issue.
16+
17+
18+
## Submitting a bugs/feature request
19+
Have a bug to report or feature to request? Follow these steps:
20+
1. Search on the [FreeRTOS Community Support Forums](https://forums.freertos.org/) and [GitHub issue tracker](https://github.com/FreeRTOS/FreeRTOS/issues?utf8=%E2%9C%93&q=is%3Aissue) to be sure this hasn't been already reported or discussed.
21+
2. If your search turns up empty, create a new topic in the [forums](https://forums.freertos.org/) and work with the community to help clarify issues or refine the idea. Include as many of the details listed below.
22+
3. Once the community has had time to discuss and digest, we welcome you to create an [issue](https://github.com/FreeRTOS/FreeRTOS/issues) to report bugs or suggest features.
23+
24+
When creating a new topic on the forums or filing an issue, please include as many relevant details as possible. Examples include:
25+
26+
* A clear description of the situation — what you observe, what you expect, and your view on how the two differ.
27+
* A reproducible test case or sequence of steps.
28+
* The version of our code being used.
29+
* Any modifications you've made relevant to the bug.
30+
* Details of your environment or deployment. Highlight anything unusual.
31+
32+
33+
## Contributing via pull request
34+
Contributions via pull requests are much appreciated. Before sending us a pull request, please ensure that:
35+
36+
1. You are working against the latest source on the *main* branch.
37+
2. You check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem already.
38+
3. You open an issue to discuss any significant work - we would hate for your time to be wasted.
39+
40+
To send us a pull request, please:
41+
42+
1. Fork the repository.
43+
2. Modify the source; focus on the specific change you are contributing. If you also reformat all the code, it will be hard for us to focus on your change.
44+
3. Follow the [coding style guide](https://www.FreeRTOS.org/FreeRTOS-Coding-Standard-and-Style-Guide.html).
45+
4. Commit to your fork using clear commit messages.
46+
5. Send us a pull request, answering any default questions in the pull request interface.
47+
NOTE: Please make sure the default option (Allow edits from maintainers) is left checked.
48+
6. Pay attention to any automated CI failures reported in the pull request, and stay involved in the conversation.
49+
50+
GitHub provides additional document on [forking a repository](https://help.github.com/articles/fork-a-repo/) and
51+
[creating a pull request](https://help.github.com/articles/creating-a-pull-request/).
52+
53+
## Coding style
54+
* Please ensure that your code complies to the [FreeRTOS coding style guidelines](https://www.FreeRTOS.org/FreeRTOS-Coding-Standard-and-Style-Guide.html).
55+
56+
57+
## Getting your pull request merged
58+
All pull requests must be approved by our review team before it can be merged in. We appreciate your patience while pull requests are reviewed. The time it takes to review will depend on complexity and consideration of wider implications.
59+
60+
61+
## Finding contributions to work on
62+
Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels (enhancement/bug/duplicate/help wanted/invalid/question/wontfix), tackling open 'help wanted' issues is a great place to start.
63+
64+
65+
## Licensing
66+
The FreeRTOS kernel is released under the MIT open source license, the text of which can be found [here](https://github.com/FreeRTOS/FreeRTOS/blob/main/FreeRTOS/License/license.txt)
67+
68+
Additional license files can be found in the folders containing any supplementary libraries licensed by their respective copyright owners where applicable.
69+
70+
We may ask you to sign a [Contributor License Agreement (CLA)](https://en.wikipedia.org/wiki/Contributor_License_Agreement) for larger changes.

.github/workflows/kernel-checks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
uses: actions/checkout@v2
2222
with:
2323
repository: FreeRTOS/FreeRTOS
24-
ref: master
24+
ref: main
2525
path: tools
2626

2727
# Checkout user pull request changes
@@ -52,7 +52,7 @@ jobs:
5252
- name: Checkout the parent repository
5353
uses: actions/checkout@v2
5454
with:
55-
ref: master
55+
ref: main
5656
repository: FreeRTOS/FreeRTOS
5757
submodules: 'recursive'
5858
fetch-depth: 1

.github/workflows/unit-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
- name: Checkout Parent Repository
99
uses: actions/checkout@v2
1010
with:
11-
ref: master
11+
ref: main
1212
repository: FreeRTOS/FreeRTOS
1313
submodules: 'recursive'
1414
fetch-depth: 1

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ See the readme file in the ```./portable``` directory for more information.
3131
- The ```./include``` directory contains the real time kernel header files.
3232

3333
### Code Formatting
34-
FreeRTOS files are formatted using the "uncrustify" tool. The configuration file used by uncrustify can be found in the [FreeRTOS/FreeRTOS repository](https://github.com/FreeRTOS/FreeRTOS/blob/master/tools/uncrustify.cfg).
34+
FreeRTOS files are formatted using the "uncrustify" tool. The configuration file used by uncrustify can be found in the [FreeRTOS/FreeRTOS repository](https://github.com/FreeRTOS/FreeRTOS/blob/main/tools/uncrustify.cfg).
3535

3636
### Spelling
3737
*lexicon.txt* contains words that are not traditionally found in an English dictionary. It is used by the spellchecker to verify the various jargon, variable names, and other odd words used in the FreeRTOS code base. If your pull request fails to pass the spelling and you believe this is a mistake, then add the word to *lexicon.txt*.

0 commit comments

Comments
 (0)