Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
JonatanAntoni committed May 2, 2022
2 parents 13b9f72 + 2c9d1f1 commit 2b7495b
Show file tree
Hide file tree
Showing 2,364 changed files with 558,198 additions and 115,954 deletions.
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,6 @@
# Denote all files that are truly binary and should not be modified.
*.png binary
*.jpg binary
# Script files
*.py text eol=lf
*.sh text eol=lf
16 changes: 16 additions & 0 deletions .github/fileheader.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"problemMatcher": [
{
"owner": "fileheader",
"severity": "error",
"pattern": [
{
"regexp": "^(.*):(\\d+):(.*)$",
"file": 1,
"line": 2,
"message": 3
}
]
}
]
}
16 changes: 16 additions & 0 deletions .github/linkchecker.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"problemMatcher": [
{
"owner": "fileheader",
"severity": "error",
"pattern": [
{
"regexp": "^(.*):(\\d+);(.*);(.*)$",
"file": 1,
"line": 2,
"message": 4
}
]
}
]
}
13 changes: 11 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,19 @@ on:
workflow_dispatch:
push:
branches: [ develop ]
paths:
- 'CMSIS/Core/**'
- 'CMSIS/Core_A/**'
- 'CMSIS/CoreValidation/**'
- 'Device/ARM/**'
pull_request:
# The branches below must be a subset of the branches above
branches: [ develop ]

paths:
- '.github/workflows/codeql-analysis.yml'
- 'CMSIS/Core/**'
- 'CMSIS/Core_A/**'
- 'CMSIS/CoreValidation/**'
- 'Device/ARM/**'
jobs:
analyze:
name: Analyze
Expand Down
37 changes: 37 additions & 0 deletions .github/workflows/fileheader.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: File header

on:
pull_request:
branches: [ develop ]
paths:
- 'CMSIS/Core/**'
- 'CMSIS/Core_A/**'
- 'CMSIS/RTOS2/Include/**'
- 'CMSIS/RTOS2/Source/**'
- 'Device/**'

permissions:
contents: read
pull-requests: write

jobs:
check:
name: Check file header
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v2
with:
ref: ${{ github.event.pull_request.head.sha }}
fetch-depth: ${{ github.event.pull_request.commits }}
- id: files
uses: jitterbit/get-changed-files@v1
- name: Check changed files
run: |
echo "::add-matcher::.github/fileheader.json"
RC=0
for changed_file in ${{ steps.files.outputs.added_modified }}; do
./CMSIS/Utilities/check_header.sh ${changed_file} || RC=1
done
echo "::remove-matcher owner=fileheader::"
exit $RC
26 changes: 24 additions & 2 deletions .github/workflows/gh-pages.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
name: Publish Documentation
on:
workflow_dispatch:
pull_request:
branches: [ develop ]
paths:
- '.github/workflows/gh-pages.yaml'
- 'CMSIS/Utilities/check_links.sh'
- 'CMSIS/DoxyGen/**'
push:
branches:
- develop
branches: [ develop ]
paths:
- '.github/workflows/gh-pages.yaml'
- 'CMSIS/Utilities/check_links.sh'
- 'CMSIS/DoxyGen/**'
jobs:
docs:
Expand All @@ -21,16 +28,31 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install --no-install-recommends -y mscgen=0.20-12
- name: Install linkchecker
run: |
sudo pip install LinkChecker
- name: Generate doxygen
run: CMSIS/DoxyGen/gen_doc.sh
- name: Run linkchecker
run: |
echo "::add-matcher::.github/linkchecker.json"
CMSIS/Utilities/check_links.sh CMSIS/Documentation/index.html
- name: Upload documentation
if: ${{ github.event_name == 'pull_request' }}
uses: actions/upload-artifact@v2
with:
path: CMSIS/Documentation/**
- name: Archive documentation
if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
run: |
cd CMSIS/Documentation
tar -cvjf /tmp/doc.tbz2 .
- uses: actions/checkout@v2
if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
with:
ref: gh-pages
- name: Publish documentation
if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
run: |
rm -r develop
mkdir develop
Expand Down
30 changes: 30 additions & 0 deletions .github/workflows/packdesc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Pack Description

on:
pull_request:
branches: [ develop ]
paths:
- 'ARM.CMSIS.pdsc'

permissions:
contents: read
pull-requests: write

jobs:
check:
name: Check pack description schema
runs-on: ubuntu-latest
steps:
- name: Install xmllint
run: |
sudo apt-get install libxml2-utils
- name: Checkout repository
uses: actions/checkout@v2
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Run xmllint
run: |
curl https://raw.githubusercontent.com/Open-CMSIS-Pack/Open-CMSIS-Pack-Spec/main/schema/PACK.xsd -o CMSIS/Utilities/PACK.xsd
echo "::add-matcher::.github/xmllint.json"
xmllint --noout --schema "$(realpath -m ./CMSIS/Utilities/PACK.xsd)" "ARM.CMSIS.pdsc"
echo "::remove-matcher owner=xmllint::"
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
mkdir ${RELEASE}
rm latest
ln -s ${RELEASE} latest
cd RELEASE
cd ${RELEASE}
tar -xvjf /tmp/doc.tbz2
git config user.name github-actions
git config user.email [email protected]
Expand Down
16 changes: 16 additions & 0 deletions .github/xmllint.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"problemMatcher": [
{
"owner": "xmllint",
"severity": "error",
"pattern": [
{
"regexp": "^(.*):(\\d+):(.*)$",
"file": 1,
"line": 2,
"message": 3
}
]
}
]
}
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,8 @@ CMSIS/RTOS/RTX/LIB/**/*.lib
CMSIS/RTOS2/RTX/Library/**/*.a
CMSIS/RTOS2/RTX/Library/**/*.lib
output
.DS_Store
internal.cp310-win_amd64.pyd
CMSIS/Utilities/Darwin64
CMSIS/Utilities/Linux64
CMSIS/Utilities/Win32
Loading

0 comments on commit 2b7495b

Please sign in to comment.