Skip to content

Commit 4d99e96

Browse files
authored
Use updated action to fix warnings (#2420)
Updated the version to fix warnings in [Nightly](https://github.com/Open-CMSIS-Pack/devtools/actions/runs/24057559428). The changes shall try to install the dependencies only when they are not available. ``` Warning: doxygen 1.16.1 is already installed and up-to-date. Warning: swig 4.4.1 is already installed and up-to-date. ```
1 parent dbefa34 commit 4d99e96

7 files changed

Lines changed: 33 additions & 35 deletions

File tree

.github/Brewfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
brew "dos2unix"
2+
brew "ninja"
3+
brew "wget"

.github/workflows/buildmgr.yml

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373

7474
# https://github.com/Open-CMSIS-Pack/devtools-build-action
7575
- name: Build
76-
uses: Open-CMSIS-Pack/devtools-build-action@1f131b70796337c98d4f680632bb4135d90f17f0 # arm64
76+
uses: Open-CMSIS-Pack/devtools-build-action@5b24a2b5145eb406a664269b3704bb983c19242d # arm64
7777
id: devtools-build
7878
with:
7979
target: cbuildgen
@@ -329,7 +329,7 @@ jobs:
329329
overwrite: true
330330
asset_name: cbuild_install.sh
331331

332-
- name: Attach debian installer to release
332+
- name: Attach Debian installer to release
333333
if: ${{ github.event_name == 'release' }}
334334
uses: svenstaro/upload-release-action@29e53e917877a24fad85510ded594ab3c9ca12de # v2
335335
with:
@@ -363,15 +363,7 @@ jobs:
363363
with:
364364
egress-policy: audit
365365

366-
- name: Install macos deps
367-
if: ${{ startsWith(matrix.runs_on, 'macos') }}
368-
run: |
369-
brew install \
370-
dos2unix \
371-
ninja \
372-
wget
373-
374-
- name: Install linux deps
366+
- name: Install Linux deps
375367
if: ${{ startsWith(matrix.runs_on, 'ubuntu') }}
376368
run: |
377369
sudo apt-get update
@@ -438,12 +430,17 @@ jobs:
438430

439431
# https://github.com/Open-CMSIS-Pack/devtools-build-action
440432
- name: Build CbuildUnitTests
441-
uses: Open-CMSIS-Pack/devtools-build-action@1f131b70796337c98d4f680632bb4135d90f17f0 # arm64
433+
uses: Open-CMSIS-Pack/devtools-build-action@5b24a2b5145eb406a664269b3704bb983c19242d # arm64
442434
with:
443435
target: CbuildUnitTests
444436
build_type: Debug
445437
arch: ${{ matrix.arch }}
446438

439+
- name: Install macos deps
440+
if: ${{ startsWith(matrix.runs_on, 'macos') }}
441+
run: |
442+
brew bundle install --file="${{ github.workspace }}/.github/Brewfile" --no-upgrade
443+
447444
- name: Run CbuildUnitTests
448445
if: matrix.arch != 'arm64'
449446
run: ctest -V -R CbuildUnitTests
@@ -460,7 +457,7 @@ jobs:
460457

461458
# https://github.com/Open-CMSIS-Pack/devtools-build-action
462459
- name: Build CbuildIntegTests
463-
uses: Open-CMSIS-Pack/devtools-build-action@1f131b70796337c98d4f680632bb4135d90f17f0 # arm64
460+
uses: Open-CMSIS-Pack/devtools-build-action@5b24a2b5145eb406a664269b3704bb983c19242d # arm64
464461
with:
465462
target: CbuildIntegTests
466463
build_type: Debug

.github/workflows/packchk.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080

8181
# https://github.com/Open-CMSIS-Pack/devtools-build-action
8282
- name: Build packchk
83-
uses: Open-CMSIS-Pack/devtools-build-action@1f131b70796337c98d4f680632bb4135d90f17f0 # arm64
83+
uses: Open-CMSIS-Pack/devtools-build-action@5b24a2b5145eb406a664269b3704bb983c19242d # arm64
8484
with:
8585
target: packchkdist
8686
arch: ${{ matrix.arch }}
@@ -168,7 +168,7 @@ jobs:
168168

169169
# https://github.com/Open-CMSIS-Pack/devtools-build-action
170170
- name: Build PackChkUnitTests
171-
uses: Open-CMSIS-Pack/devtools-build-action@1f131b70796337c98d4f680632bb4135d90f17f0 # arm64
171+
uses: Open-CMSIS-Pack/devtools-build-action@5b24a2b5145eb406a664269b3704bb983c19242d # arm64
172172
with:
173173
arch: ${{ matrix.arch }}
174174
build_type: Debug
@@ -182,7 +182,7 @@ jobs:
182182

183183
# https://github.com/Open-CMSIS-Pack/devtools-build-action
184184
- name: Build PackChkIntegTests
185-
uses: Open-CMSIS-Pack/devtools-build-action@1f131b70796337c98d4f680632bb4135d90f17f0 # arm64
185+
uses: Open-CMSIS-Pack/devtools-build-action@5b24a2b5145eb406a664269b3704bb983c19242d # arm64
186186
with:
187187
arch: ${{ matrix.arch }}
188188
build_type: Debug
@@ -243,7 +243,7 @@ jobs:
243243

244244
# https://github.com/Open-CMSIS-Pack/devtools-build-action
245245
- name: Build PackChkUnitTests
246-
uses: Open-CMSIS-Pack/devtools-build-action@1f131b70796337c98d4f680632bb4135d90f17f0 # arm64
246+
uses: Open-CMSIS-Pack/devtools-build-action@5b24a2b5145eb406a664269b3704bb983c19242d # arm64
247247
with:
248248
add_cmake_variables: -DCOVERAGE=ON
249249
arch: amd64
@@ -252,7 +252,7 @@ jobs:
252252

253253
# https://github.com/Open-CMSIS-Pack/devtools-build-action
254254
- name: Build PackChkIntegTests
255-
uses: Open-CMSIS-Pack/devtools-build-action@1f131b70796337c98d4f680632bb4135d90f17f0 # arm64
255+
uses: Open-CMSIS-Pack/devtools-build-action@5b24a2b5145eb406a664269b3704bb983c19242d # arm64
256256
with:
257257
add_cmake_variables: -DCOVERAGE=ON
258258
arch: amd64

.github/workflows/packgen.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373

7474
# https://github.com/Open-CMSIS-Pack/devtools-build-action
7575
- name: Build
76-
uses: Open-CMSIS-Pack/devtools-build-action@1f131b70796337c98d4f680632bb4135d90f17f0 # arm64
76+
uses: Open-CMSIS-Pack/devtools-build-action@5b24a2b5145eb406a664269b3704bb983c19242d # arm64
7777
id: devtools-build
7878
with:
7979
target: packgen
@@ -202,7 +202,7 @@ jobs:
202202

203203
# https://github.com/Open-CMSIS-Pack/devtools-build-action
204204
- name: Build PackGenUnitTests
205-
uses: Open-CMSIS-Pack/devtools-build-action@1f131b70796337c98d4f680632bb4135d90f17f0 # arm64
205+
uses: Open-CMSIS-Pack/devtools-build-action@5b24a2b5145eb406a664269b3704bb983c19242d # arm64
206206
with:
207207
target: PackGenUnitTests
208208
build_type: Debug
@@ -255,7 +255,7 @@ jobs:
255255

256256
# https://github.com/Open-CMSIS-Pack/devtools-build-action
257257
- name: Build PackGenUnitTests
258-
uses: Open-CMSIS-Pack/devtools-build-action@1f131b70796337c98d4f680632bb4135d90f17f0 # arm64
258+
uses: Open-CMSIS-Pack/devtools-build-action@5b24a2b5145eb406a664269b3704bb983c19242d # arm64
259259
with:
260260
add_cmake_variables: -DCOVERAGE=ON
261261
arch: amd64

.github/workflows/projmgr.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878

7979
# https://github.com/Open-CMSIS-Pack/devtools-build-action
8080
- name: Build
81-
uses: Open-CMSIS-Pack/devtools-build-action@1f131b70796337c98d4f680632bb4135d90f17f0 # arm64
81+
uses: Open-CMSIS-Pack/devtools-build-action@5b24a2b5145eb406a664269b3704bb983c19242d # arm64
8282
with:
8383
target: projmgr
8484
arch: ${{ matrix.arch }}
@@ -160,7 +160,7 @@ jobs:
160160

161161
- name: Build swig python libs
162162
if: matrix.pyswig
163-
uses: Open-CMSIS-Pack/devtools-build-action@1f131b70796337c98d4f680632bb4135d90f17f0 # arm64
163+
uses: Open-CMSIS-Pack/devtools-build-action@5b24a2b5145eb406a664269b3704bb983c19242d # arm64
164164
with:
165165
add_cmake_variables: -DSWIG_LIBS=ON
166166
add_cmake_build_args: --config Release
@@ -170,7 +170,7 @@ jobs:
170170

171171
- name: Build swig go libs
172172
if: matrix.goswig
173-
uses: Open-CMSIS-Pack/devtools-build-action@1f131b70796337c98d4f680632bb4135d90f17f0 # arm64
173+
uses: Open-CMSIS-Pack/devtools-build-action@5b24a2b5145eb406a664269b3704bb983c19242d # arm64
174174
with:
175175
add_cmake_variables: -DSWIG_LIBS=ON
176176
add_cmake_build_args: --config Release
@@ -385,7 +385,7 @@ jobs:
385385

386386
# https://github.com/Open-CMSIS-Pack/devtools-build-action
387387
- name: Build ProjMgrUnitTests
388-
uses: Open-CMSIS-Pack/devtools-build-action@1f131b70796337c98d4f680632bb4135d90f17f0 # arm64
388+
uses: Open-CMSIS-Pack/devtools-build-action@5b24a2b5145eb406a664269b3704bb983c19242d # arm64
389389
with:
390390
arch: ${{ matrix.arch }}
391391
build_type: Debug
@@ -447,7 +447,7 @@ jobs:
447447

448448
# https://github.com/Open-CMSIS-Pack/devtools-build-action
449449
- name: Build ProjMgrUnitTests
450-
uses: Open-CMSIS-Pack/devtools-build-action@1f131b70796337c98d4f680632bb4135d90f17f0 # arm64
450+
uses: Open-CMSIS-Pack/devtools-build-action@5b24a2b5145eb406a664269b3704bb983c19242d # arm64
451451
with:
452452
add_cmake_variables: -DCOVERAGE=ON
453453
arch: amd64

.github/workflows/svdconv.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
fetch-depth: 0
7272

7373
- name: Build svdconv
74-
uses: Open-CMSIS-Pack/devtools-build-action@1f131b70796337c98d4f680632bb4135d90f17f0 # arm64
74+
uses: Open-CMSIS-Pack/devtools-build-action@5b24a2b5145eb406a664269b3704bb983c19242d # arm64
7575
with:
7676
target: svdconvdist
7777
arch: ${{ matrix.arch }}
@@ -158,7 +158,7 @@ jobs:
158158

159159
# https://github.com/Open-CMSIS-Pack/devtools-build-action
160160
- name: Build SVDConvUnitTests
161-
uses: Open-CMSIS-Pack/devtools-build-action@1f131b70796337c98d4f680632bb4135d90f17f0 # arm64
161+
uses: Open-CMSIS-Pack/devtools-build-action@5b24a2b5145eb406a664269b3704bb983c19242d # arm64
162162
with:
163163
arch: ${{ matrix.arch }}
164164
build_type: Debug
@@ -172,7 +172,7 @@ jobs:
172172

173173
# https://github.com/Open-CMSIS-Pack/devtools-build-action
174174
- name: Build SvdConvIntegTests
175-
uses: Open-CMSIS-Pack/devtools-build-action@1f131b70796337c98d4f680632bb4135d90f17f0 # arm64
175+
uses: Open-CMSIS-Pack/devtools-build-action@5b24a2b5145eb406a664269b3704bb983c19242d # arm64
176176
with:
177177
arch: ${{ matrix.arch }}
178178
build_type: Debug
@@ -234,7 +234,7 @@ jobs:
234234

235235
# https://github.com/Open-CMSIS-Pack/devtools-build-action
236236
- name: Build SVDConvUnitTests
237-
uses: Open-CMSIS-Pack/devtools-build-action@1f131b70796337c98d4f680632bb4135d90f17f0 # arm64
237+
uses: Open-CMSIS-Pack/devtools-build-action@5b24a2b5145eb406a664269b3704bb983c19242d # arm64
238238
with:
239239
add_cmake_variables: -DCOVERAGE=ON
240240
arch: amd64
@@ -243,7 +243,7 @@ jobs:
243243

244244
# https://github.com/Open-CMSIS-Pack/devtools-build-action
245245
- name: Build SvdConvIntegTests
246-
uses: Open-CMSIS-Pack/devtools-build-action@1f131b70796337c98d4f680632bb4135d90f17f0 # arm64
246+
uses: Open-CMSIS-Pack/devtools-build-action@5b24a2b5145eb406a664269b3704bb983c19242d # arm64
247247
with:
248248
add_cmake_variables: -DCOVERAGE=ON
249249
arch: amd64

.github/workflows/test_libs.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656

5757
# https://github.com/Open-CMSIS-Pack/devtools-build-action
5858
- name: Build all libs
59-
uses: Open-CMSIS-Pack/devtools-build-action@1f131b70796337c98d4f680632bb4135d90f17f0 # arm64
59+
uses: Open-CMSIS-Pack/devtools-build-action@5b24a2b5145eb406a664269b3704bb983c19242d # arm64
6060
id: devtools-build
6161
with:
6262
add_cmake_variables: '-DLIBS_ONLY=ON'
@@ -66,9 +66,7 @@ jobs:
6666
- name: Install macos deps
6767
if: ${{ startsWith(matrix.runs_on, 'macos') }}
6868
run: |
69-
brew install \
70-
dos2unix \
71-
wget
69+
brew bundle install --file="${{ github.workspace }}/.github/Brewfile" --no-upgrade
7270
7371
- name: Install linux deps
7472
if: ${{ startsWith(matrix.runs_on, 'ubuntu') }}

0 commit comments

Comments
 (0)