Skip to content

Commit 2b7495b

Browse files
committed
Merge branch 'develop'
2 parents 13b9f72 + 2c9d1f1 commit 2b7495b

File tree

2,364 files changed

+558198
-115954
lines changed

Some content is hidden

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

2,364 files changed

+558198
-115954
lines changed

.gitattributes

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,6 @@
1515
# Denote all files that are truly binary and should not be modified.
1616
*.png binary
1717
*.jpg binary
18+
# Script files
19+
*.py text eol=lf
20+
*.sh text eol=lf

.github/fileheader.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"problemMatcher": [
3+
{
4+
"owner": "fileheader",
5+
"severity": "error",
6+
"pattern": [
7+
{
8+
"regexp": "^(.*):(\\d+):(.*)$",
9+
"file": 1,
10+
"line": 2,
11+
"message": 3
12+
}
13+
]
14+
}
15+
]
16+
}

.github/linkchecker.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"problemMatcher": [
3+
{
4+
"owner": "fileheader",
5+
"severity": "error",
6+
"pattern": [
7+
{
8+
"regexp": "^(.*):(\\d+);(.*);(.*)$",
9+
"file": 1,
10+
"line": 2,
11+
"message": 4
12+
}
13+
]
14+
}
15+
]
16+
}

.github/workflows/codeql-analysis.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,19 @@ on:
44
workflow_dispatch:
55
push:
66
branches: [ develop ]
7+
paths:
8+
- 'CMSIS/Core/**'
9+
- 'CMSIS/Core_A/**'
10+
- 'CMSIS/CoreValidation/**'
11+
- 'Device/ARM/**'
712
pull_request:
8-
# The branches below must be a subset of the branches above
913
branches: [ develop ]
10-
14+
paths:
15+
- '.github/workflows/codeql-analysis.yml'
16+
- 'CMSIS/Core/**'
17+
- 'CMSIS/Core_A/**'
18+
- 'CMSIS/CoreValidation/**'
19+
- 'Device/ARM/**'
1120
jobs:
1221
analyze:
1322
name: Analyze

.github/workflows/fileheader.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: File header
2+
3+
on:
4+
pull_request:
5+
branches: [ develop ]
6+
paths:
7+
- 'CMSIS/Core/**'
8+
- 'CMSIS/Core_A/**'
9+
- 'CMSIS/RTOS2/Include/**'
10+
- 'CMSIS/RTOS2/Source/**'
11+
- 'Device/**'
12+
13+
permissions:
14+
contents: read
15+
pull-requests: write
16+
17+
jobs:
18+
check:
19+
name: Check file header
20+
runs-on: ubuntu-latest
21+
steps:
22+
- name: Checkout repository
23+
uses: actions/checkout@v2
24+
with:
25+
ref: ${{ github.event.pull_request.head.sha }}
26+
fetch-depth: ${{ github.event.pull_request.commits }}
27+
- id: files
28+
uses: jitterbit/get-changed-files@v1
29+
- name: Check changed files
30+
run: |
31+
echo "::add-matcher::.github/fileheader.json"
32+
RC=0
33+
for changed_file in ${{ steps.files.outputs.added_modified }}; do
34+
./CMSIS/Utilities/check_header.sh ${changed_file} || RC=1
35+
done
36+
echo "::remove-matcher owner=fileheader::"
37+
exit $RC

.github/workflows/gh-pages.yaml

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,17 @@
11
name: Publish Documentation
22
on:
33
workflow_dispatch:
4+
pull_request:
5+
branches: [ develop ]
6+
paths:
7+
- '.github/workflows/gh-pages.yaml'
8+
- 'CMSIS/Utilities/check_links.sh'
9+
- 'CMSIS/DoxyGen/**'
410
push:
5-
branches:
6-
- develop
11+
branches: [ develop ]
712
paths:
13+
- '.github/workflows/gh-pages.yaml'
14+
- 'CMSIS/Utilities/check_links.sh'
815
- 'CMSIS/DoxyGen/**'
916
jobs:
1017
docs:
@@ -21,16 +28,31 @@ jobs:
2128
run: |
2229
sudo apt-get update
2330
sudo apt-get install --no-install-recommends -y mscgen=0.20-12
31+
- name: Install linkchecker
32+
run: |
33+
sudo pip install LinkChecker
2434
- name: Generate doxygen
2535
run: CMSIS/DoxyGen/gen_doc.sh
36+
- name: Run linkchecker
37+
run: |
38+
echo "::add-matcher::.github/linkchecker.json"
39+
CMSIS/Utilities/check_links.sh CMSIS/Documentation/index.html
40+
- name: Upload documentation
41+
if: ${{ github.event_name == 'pull_request' }}
42+
uses: actions/upload-artifact@v2
43+
with:
44+
path: CMSIS/Documentation/**
2645
- name: Archive documentation
46+
if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
2747
run: |
2848
cd CMSIS/Documentation
2949
tar -cvjf /tmp/doc.tbz2 .
3050
- uses: actions/checkout@v2
51+
if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
3152
with:
3253
ref: gh-pages
3354
- name: Publish documentation
55+
if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
3456
run: |
3557
rm -r develop
3658
mkdir develop

.github/workflows/packdesc.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Pack Description
2+
3+
on:
4+
pull_request:
5+
branches: [ develop ]
6+
paths:
7+
- 'ARM.CMSIS.pdsc'
8+
9+
permissions:
10+
contents: read
11+
pull-requests: write
12+
13+
jobs:
14+
check:
15+
name: Check pack description schema
16+
runs-on: ubuntu-latest
17+
steps:
18+
- name: Install xmllint
19+
run: |
20+
sudo apt-get install libxml2-utils
21+
- name: Checkout repository
22+
uses: actions/checkout@v2
23+
with:
24+
ref: ${{ github.event.pull_request.head.sha }}
25+
- name: Run xmllint
26+
run: |
27+
curl https://raw.githubusercontent.com/Open-CMSIS-Pack/Open-CMSIS-Pack-Spec/main/schema/PACK.xsd -o CMSIS/Utilities/PACK.xsd
28+
echo "::add-matcher::.github/xmllint.json"
29+
xmllint --noout --schema "$(realpath -m ./CMSIS/Utilities/PACK.xsd)" "ARM.CMSIS.pdsc"
30+
echo "::remove-matcher owner=xmllint::"

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
mkdir ${RELEASE}
3333
rm latest
3434
ln -s ${RELEASE} latest
35-
cd RELEASE
35+
cd ${RELEASE}
3636
tar -xvjf /tmp/doc.tbz2
3737
git config user.name github-actions
3838
git config user.email [email protected]

.github/xmllint.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"problemMatcher": [
3+
{
4+
"owner": "xmllint",
5+
"severity": "error",
6+
"pattern": [
7+
{
8+
"regexp": "^(.*):(\\d+):(.*)$",
9+
"file": 1,
10+
"line": 2,
11+
"message": 3
12+
}
13+
]
14+
}
15+
]
16+
}

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,8 @@ CMSIS/RTOS/RTX/LIB/**/*.lib
1515
CMSIS/RTOS2/RTX/Library/**/*.a
1616
CMSIS/RTOS2/RTX/Library/**/*.lib
1717
output
18+
.DS_Store
19+
internal.cp310-win_amd64.pyd
20+
CMSIS/Utilities/Darwin64
21+
CMSIS/Utilities/Linux64
22+
CMSIS/Utilities/Win32

0 commit comments

Comments
 (0)