Skip to content

Commit ece41ca

Browse files
authored
Merge branch 'main' into use-node-24
2 parents 8bbd16e + f74c516 commit ece41ca

10 files changed

Lines changed: 40 additions & 25 deletions

File tree

.github/pull_request_template.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
## Fixes
2+
<!-- List the issue(s) this PR resolves -->
3+
-
4+
5+
## Changes
6+
<!-- List the changes this PR introduces -->
7+
-
8+
9+
## Checklist
10+
<!-- Put an `x` in the boxes. All tasks must be completed and boxes checked before merging. -->
11+
- [ ] 🤖 This change is covered by unit tests (if applicable).
12+
- [ ] 🤹 Manual testing has been performed (if necessary).
13+
- [ ] 🛡️ Security impacts have been considered (if relevant).
14+
- [ ] 📖 Documentation updates are complete (if required).
15+
- [ ] 🧠 Third-party dependencies and TPIP updated (if required).

.github/workflows/buildmgr.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ env:
4343

4444
jobs:
4545
setup:
46-
uses: Open-CMSIS-Pack/devtools/.github/workflows/shared_setup_env.yml@main
46+
uses: ./.github/workflows/shared_setup_env.yml
4747
with:
4848
run_if: ${{ fromJSON((github.event_name == 'pull_request') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'release' && startsWith(github.ref, 'refs/tags/tools/buildmgr/')) || ((github.event.schedule != '') && (!github.event.repository.private))) }}
4949

5050
matrix_prep:
5151
needs: setup
52-
uses: Open-CMSIS-Pack/devtools/.github/workflows/shared_matrix_prep.yml@main
52+
uses: ./.github/workflows/shared_matrix_prep.yml
5353
with:
5454
workflow_name: buildmgr
5555

@@ -143,7 +143,7 @@ jobs:
143143
sudo apt-get install ninja-build python3
144144
wget -q http://security.ubuntu.com/ubuntu/pool/main//d/doxygen/doxygen_1.8.6-2_amd64.deb
145145
sudo dpkg -i doxygen_1.8.6-2_amd64.deb
146-
sudo pip install LinkChecker
146+
sudo pip install LinkChecker==10.6.0
147147
- name: Create build folder
148148
run: mkdir build
149149

.github/workflows/global.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Check copyright notice
2424
run: |
2525
pip install \
26-
pre-commit \
27-
python-magic==0.4.18 \
28-
comment-parser>=1.2.3
26+
pre-commit==4.5.1 \
27+
python-magic==0.4.24 \
28+
comment-parser==1.2.4
2929
pre-commit run --all-files

.github/workflows/nightly.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,27 @@ permissions:
1111
jobs:
1212
buildmgr:
1313
if: github.repository == 'Open-CMSIS-Pack/devtools'
14-
uses: Open-CMSIS-Pack/devtools/.github/workflows/buildmgr.yml@main
14+
uses: ./.github/workflows/buildmgr.yml
1515
secrets: inherit
1616
packchk:
1717
needs: [buildmgr]
18-
uses: Open-CMSIS-Pack/devtools/.github/workflows/packchk.yml@main
18+
uses: ./.github/workflows/packchk.yml
1919
secrets: inherit
2020
packgen:
2121
needs: [packchk]
22-
uses: Open-CMSIS-Pack/devtools/.github/workflows/packgen.yml@main
22+
uses: ./.github/workflows/packgen.yml
2323
secrets: inherit
2424
projmgr:
2525
needs: [packgen]
26-
uses: Open-CMSIS-Pack/devtools/.github/workflows/projmgr.yml@main
26+
uses: ./.github/workflows/projmgr.yml
2727
secrets: inherit
2828
svdconv:
2929
needs: [projmgr]
30-
uses: Open-CMSIS-Pack/devtools/.github/workflows/svdconv.yml@main
30+
uses: ./.github/workflows/svdconv.yml
3131
secrets: inherit
3232
test_libs:
3333
needs: [svdconv]
34-
uses: Open-CMSIS-Pack/devtools/.github/workflows/test_libs.yml@main
34+
uses: ./.github/workflows/test_libs.yml
3535
coverage:
3636
runs-on: ubuntu-22.04
3737
needs: [ buildmgr, packchk, packgen, projmgr, svdconv, test_libs ]

.github/workflows/packchk.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ env:
4848

4949
jobs:
5050
setup:
51-
uses: Open-CMSIS-Pack/devtools/.github/workflows/shared_setup_env.yml@main
51+
uses: ./.github/workflows/shared_setup_env.yml
5252
with:
5353
run_if: ${{ fromJSON((github.event_name == 'pull_request') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'release' && startsWith(github.ref, 'refs/tags/tools/packchk/')) || ((github.event.schedule != '') && (!github.event.repository.private))) }}
5454

5555
matrix_prep:
5656
needs: setup
57-
uses: Open-CMSIS-Pack/devtools/.github/workflows/shared_matrix_prep.yml@main
57+
uses: ./.github/workflows/shared_matrix_prep.yml
5858
with:
5959
workflow_name: packchk
6060

.github/workflows/packgen.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ env:
4343

4444
jobs:
4545
setup:
46-
uses: Open-CMSIS-Pack/devtools/.github/workflows/shared_setup_env.yml@main
46+
uses: ./.github/workflows/shared_setup_env.yml
4747
with:
4848
run_if: ${{ fromJSON((github.event_name == 'pull_request') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'release' && startsWith(github.ref, 'refs/tags/tools/packgen/')) || ((github.event.schedule != '') && (!github.event.repository.private))) }}
4949

5050
matrix_prep:
5151
needs: setup
52-
uses: Open-CMSIS-Pack/devtools/.github/workflows/shared_matrix_prep.yml@main
52+
uses: ./.github/workflows/shared_matrix_prep.yml
5353
with:
5454
workflow_name: packgen
5555

.github/workflows/projmgr.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,21 +47,21 @@ env:
4747

4848
jobs:
4949
setup:
50-
uses: Open-CMSIS-Pack/devtools/.github/workflows/shared_setup_env.yml@main
50+
uses: ./.github/workflows/shared_setup_env.yml
5151
with:
5252
run_if: ${{ fromJSON((github.event_name == 'pull_request') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'release' && startsWith(github.ref, 'refs/tags/tools/projmgr/')) || ((github.event.schedule != '') && (!github.event.repository.private))) }}
5353

5454
matrix_prep:
5555
needs: setup
56-
uses: Open-CMSIS-Pack/devtools/.github/workflows/shared_matrix_prep.yml@main
56+
uses: ./.github/workflows/shared_matrix_prep.yml
5757
with:
5858
workflow_name: projmgr
5959

6060
build:
6161
needs: [ setup, matrix_prep ]
6262
runs-on: ${{ matrix.runs_on }}
6363
name: build (${{ matrix.runs_on }},${{ matrix.arch }})
64-
timeout-minutes: 15
64+
timeout-minutes: 20
6565
strategy:
6666
# fail-fast: true
6767
matrix: ${{ fromJson(needs.matrix_prep.outputs.matrix) }}
@@ -139,7 +139,7 @@ jobs:
139139
needs: [ setup, matrix_prep ]
140140
name: build-swig (${{ matrix.runs_on }}, ${{ matrix.arch }})
141141
runs-on: ${{ matrix.runs_on }}
142-
timeout-minutes: 15
142+
timeout-minutes: 20
143143
strategy:
144144
# fail-fast: true
145145
matrix: ${{ fromJson(needs.matrix_prep.outputs.matrix) }}

.github/workflows/scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
# To guarantee Maintained check is occasionally updated. See
77
# https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
88
schedule:
9-
- cron: '0 0 * * *'
9+
- cron: '0 6 * * *'
1010
push:
1111
branches: [ "main" ]
1212
workflow_dispatch:

.github/workflows/svdconv.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ env:
4040

4141
jobs:
4242
setup:
43-
uses: Open-CMSIS-Pack/devtools/.github/workflows/shared_setup_env.yml@main
43+
uses: ./.github/workflows/shared_setup_env.yml
4444
with:
4545
run_if: ${{ fromJSON((github.event_name == 'pull_request') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'release' && startsWith(github.ref, 'refs/tags/tools/svdconv/')) || ((github.event.schedule != '') && (!github.event.repository.private))) }}
4646

4747
matrix_prep:
4848
needs: setup
49-
uses: Open-CMSIS-Pack/devtools/.github/workflows/shared_matrix_prep.yml@main
49+
uses: ./.github/workflows/shared_matrix_prep.yml
5050
with:
5151
workflow_name: svdconv
5252

.github/workflows/test_libs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ env:
3232

3333
jobs:
3434
setup:
35-
uses: Open-CMSIS-Pack/devtools/.github/workflows/shared_setup_env.yml@main
35+
uses: ./.github/workflows/shared_setup_env.yml
3636
with:
3737
run_if: ${{ ((github.event.schedule != '') && github.event.repository.private) == false }}
3838

3939
matrix_prep:
4040
needs: setup
41-
uses: Open-CMSIS-Pack/devtools/.github/workflows/shared_matrix_prep.yml@main
41+
uses: ./.github/workflows/shared_matrix_prep.yml
4242
with:
4343
workflow_name: test_libs
4444

0 commit comments

Comments
 (0)