Skip to content

Commit 21d9a61

Browse files
committed
Merge branch 'main' into stage-history
2 parents 9396e37 + 91927ab commit 21d9a61

File tree

577 files changed

+165352
-175049
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

577 files changed

+165352
-175049
lines changed

.git-blame-ignore-revs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Normalize line endings and whitespace
2+
ddd1e30018e74ad293cda0635018d636a6657f57
3+
4+
# Convert tabs to spaces (4)
5+
8c77117c32e49a5070cd85e8920c36723997e465
6+
7+
# Apply uncrustify rules
8+
587a83d647619bb0a508661c7bb4d6df89851582
9+
2c530ba5c352fdf420d1b13709a3970f04e9e6c6
10+
718178c68a1c863dd1a2eac7aea326a789d3bc52
11+
a5dbc2b1de17e5468420d5a928d7392d799780e2

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* text=auto

.github/CODEOWNERS

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,3 @@
3535
# directory in the root of your repository and any of its
3636
# subdirectories.
3737
# /docs/ @doctocat
38-
39-

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@ contact_links:
33
- name: FreeRTOS Community Support Forum
44
url: https://forums.freertos.org/
55
about: Please ask and answer questions about FreeRTOS here.
6-

.github/SECURITY.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
## Reporting a Vulnerability
2-
3-
If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security
4-
via our [vulnerability reporting page](https://aws.amazon.com/security/vulnerability-reporting/) or directly via email to [email protected].
5-
Please do **not** create a public github issue.
1+
## Reporting a Vulnerability
2+
3+
If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security
4+
via our [vulnerability reporting page](https://aws.amazon.com/security/vulnerability-reporting/) or directly via email to [email protected].
5+
Please do **not** create a public github issue.

.github/actions/url_verifier.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,3 @@ function test {
6060
}
6161

6262
test
63-

.github/scripts/find_replace.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,3 @@ new_text=$2
44
echo "Old text: ${old_text}"
55
echo "New text: ${new_text}"
66
grep -rl "${old_text}" . | xargs gsed -i -e '1h;2,$H;$!d;g' -e "s/${old_text}/${new_text}/g"
7-

.github/scripts/kernel_checker.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,4 +149,3 @@ def main():
149149

150150
if __name__ == '__main__':
151151
exit(main())
152-

.github/workflows/ci.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,26 @@ jobs:
4747
- name: Check For Trailing Whitespace
4848
run: |
4949
set +e
50-
grep --exclude="README.md" --exclude-dir="portable" -rnI -e "[[:blank:]]$" .
50+
grep --exclude="*.md" --exclude-dir=".git" -rnI -e "[[:blank:]]$" .
5151
if [ "$?" = "0" ]; then
5252
echo "Files have trailing whitespace."
5353
exit 1
5454
else
5555
exit 0
5656
fi
57+
shell: bash
58+
- name: Check for CRLF
59+
working-directory: ${{ inputs.path }}
60+
run: |
61+
set +e
62+
find . -path ./.git -prune -o -exec file {} + | grep "CRLF"
63+
if [ "$?" = "0" ]; then
64+
echo "Files have CRLF line endings."
65+
exit 1
66+
else
67+
exit 0
68+
fi
69+
shell: bash
5770

5871
url-check:
5972
runs-on: ubuntu-latest
@@ -65,4 +78,3 @@ jobs:
6578
- name: URL Checker
6679
run: |
6780
bash kernel/.github/actions/url_verifier.sh kernel
68-

GitHub-FreeRTOS-Kernel-Home.url

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@ URL=https://github.com/FreeRTOS/FreeRTOS-Kernel
55
IconIndex=0
66
IDList=
77
HotKey=0
8-

History.txt

Lines changed: 3053 additions & 3056 deletions
Large diffs are not rendered by default.

Quick_Start_Guide.url

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
[InternetShortcut]
2-
URL=https://www.FreeRTOS.org/FreeRTOS-quick-start-guide.html
3-
IDList=
4-
[{000214A0-0000-0000-C000-000000000046}]
5-
Prop3=19,2
1+
[InternetShortcut]
2+
URL=https://www.FreeRTOS.org/FreeRTOS-quick-start-guide.html
3+
IDList=
4+
[{000214A0-0000-0000-C000-000000000046}]
5+
Prop3=19,2

README.md

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,21 @@ See the readme file in the ```./portable``` directory for more information.
7676
- The ```./include``` directory contains the real time kernel header files.
7777

7878
### Code Formatting
79-
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).
79+
FreeRTOS files are formatted using the "uncrustify" tool. The configuration file used by uncrustify can be found in the [.github/uncrustify.cfg](.github/uncrustify.cfg) file.
80+
81+
### Line Endings
82+
File checked into the FreeRTOS-Kernel repository use unix-style LF line endings for the best compatbility with git.
83+
84+
For optmial compatibility with Microsoft Windows tools, it is best to enable the git autocrlf feature. You can eanble this setting for the current repository using the following command:
85+
```
86+
git config core.autocrlf true
87+
```
88+
89+
### Git History Optimizations
90+
Some commits in this repository perform large refactors which touch many lines and lead to unwanted behavior when using the `git blame` command. You can configure git to ignore the list of large refactor commits in this repository with the followig command:
91+
```
92+
git config blame.ignoreRevsFile .git-blame-ignore-revs
93+
```
8094

8195
### Spelling
8296
*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)