Skip to content

Commit 9af0b46

Browse files
soumeh01soumeh01
committed
Use updated action to fix warnings
1 parent 2b7a186 commit 9af0b46

6 files changed

Lines changed: 56 additions & 41 deletions

File tree

‎.github/workflows/buildmgr.yml‎

Lines changed: 29 additions & 19 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@b65bc4de97d7911296c566858f0087a7bbee0508 # tool-install
7777
id: devtools-build
7878
with:
7979
target: cbuildgen
@@ -366,10 +366,20 @@ jobs:
366366
- name: Install macos deps
367367
if: ${{ startsWith(matrix.runs_on, 'macos') }}
368368
run: |
369-
brew install \
370-
dos2unix \
371-
ninja \
372-
wget
369+
# Installing dos2unix, ninja, wget (Only when missing)
370+
missing=()
371+
for pkg in dos2unix ninja wget; do
372+
brew list --formula "$pkg" >/dev/null 2>&1 || missing+=("$pkg")
373+
done
374+
375+
if [ "${#missing[@]}" -gt 0 ]; then
376+
if ! brew install "${missing[@]}"; then
377+
echo "::error::Failed to install Homebrew packages: ${missing[*]}"
378+
exit 1
379+
fi
380+
else
381+
echo "All required Homebrew packages are already installed."
382+
fi
373383
374384
- name: Install linux deps
375385
if: ${{ startsWith(matrix.runs_on, 'ubuntu') }}
@@ -389,11 +399,11 @@ jobs:
389399
with:
390400
submodules: true
391401

392-
- name: Cache ARM GCC
393-
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
394-
with:
395-
key: "${{ matrix.arm_gcc_install_base }}/${{ matrix.installer_name }}"
396-
path: ${{ matrix.installer_name }}
402+
# - name: Cache ARM GCC
403+
# uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
404+
# with:
405+
# key: "${{ matrix.arm_gcc_install_base }}/${{ matrix.installer_name }}"
406+
# path: ${{ matrix.installer_name }}
397407

398408
- name: Setup ARM GCC for Ubuntu and macOS
399409
if: ${{ startsWith(matrix.runs_on, 'macos') || startsWith(matrix.runs_on, 'ubuntu') }}
@@ -438,7 +448,7 @@ jobs:
438448

439449
# https://github.com/Open-CMSIS-Pack/devtools-build-action
440450
- name: Build CbuildUnitTests
441-
uses: Open-CMSIS-Pack/devtools-build-action@1f131b70796337c98d4f680632bb4135d90f17f0 # arm64
451+
uses: Open-CMSIS-Pack/devtools-build-action@b65bc4de97d7911296c566858f0087a7bbee0508 # tool-install
442452
with:
443453
target: CbuildUnitTests
444454
build_type: Debug
@@ -460,7 +470,7 @@ jobs:
460470

461471
# https://github.com/Open-CMSIS-Pack/devtools-build-action
462472
- name: Build CbuildIntegTests
463-
uses: Open-CMSIS-Pack/devtools-build-action@1f131b70796337c98d4f680632bb4135d90f17f0 # arm64
473+
uses: Open-CMSIS-Pack/devtools-build-action@b65bc4de97d7911296c566858f0087a7bbee0508 # tool-install
464474
with:
465475
target: CbuildIntegTests
466476
build_type: Debug
@@ -548,13 +558,13 @@ jobs:
548558
test -f ${{ env.installer_name }} || wget -q ${{ env.arm_gcc_install_base }}/${{ env.installer_name }}
549559
tar -xvf ${{ env.installer_name }}
550560
551-
- name: Cache CMSIS Pack
552-
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
553-
env:
554-
CACHE_NAME: cmsis_pack
555-
with:
556-
key: ${{ env.CACHE_NAME }}-${{ runner.os }}
557-
path: ${{ env.CMSIS_PACK_ROOT }}
561+
# - name: Cache CMSIS Pack
562+
# uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
563+
# env:
564+
# CACHE_NAME: cmsis_pack
565+
# with:
566+
# key: ${{ env.CACHE_NAME }}-${{ runner.os }}
567+
# path: ${{ env.CMSIS_PACK_ROOT }}
558568

559569
- name: Build and run buildmgr tests
560570
run: |

‎.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@b65bc4de97d7911296c566858f0087a7bbee0508 # tool-install
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@b65bc4de97d7911296c566858f0087a7bbee0508 # tool-install
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@b65bc4de97d7911296c566858f0087a7bbee0508 # tool-install
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@b65bc4de97d7911296c566858f0087a7bbee0508 # tool-install
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@b65bc4de97d7911296c566858f0087a7bbee0508 # tool-install
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@b65bc4de97d7911296c566858f0087a7bbee0508 # tool-install
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@b65bc4de97d7911296c566858f0087a7bbee0508 # tool-install
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@b65bc4de97d7911296c566858f0087a7bbee0508 # tool-install
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@b65bc4de97d7911296c566858f0087a7bbee0508 # tool-install
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@b65bc4de97d7911296c566858f0087a7bbee0508 # tool-install
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@b65bc4de97d7911296c566858f0087a7bbee0508 # tool-install
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@b65bc4de97d7911296c566858f0087a7bbee0508 # tool-install
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@b65bc4de97d7911296c566858f0087a7bbee0508 # tool-install
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@b65bc4de97d7911296c566858f0087a7bbee0508 # tool-install
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@b65bc4de97d7911296c566858f0087a7bbee0508 # tool-install
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@b65bc4de97d7911296c566858f0087a7bbee0508 # tool-install
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@b65bc4de97d7911296c566858f0087a7bbee0508 # tool-install
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@b65bc4de97d7911296c566858f0087a7bbee0508 # tool-install
247247
with:
248248
add_cmake_variables: -DCOVERAGE=ON
249249
arch: amd64

‎.github/workflows/test_libs.yml‎

Lines changed: 9 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@b65bc4de97d7911296c566858f0087a7bbee0508 # tool-install
6060
id: devtools-build
6161
with:
6262
add_cmake_variables: '-DLIBS_ONLY=ON'
@@ -66,9 +66,14 @@ jobs:
6666
- name: Install macos deps
6767
if: ${{ startsWith(matrix.runs_on, 'macos') }}
6868
run: |
69-
brew install \
70-
dos2unix \
71-
wget
69+
for pkg in dos2unix wget; do
70+
if ! brew list --formula "$pkg" >/dev/null 2>&1; then
71+
if ! brew install "$pkg"; then
72+
echo "::error::Failed to install Homebrew package '$pkg'"
73+
exit 1
74+
fi
75+
fi
76+
done
7277
7378
- name: Install linux deps
7479
if: ${{ startsWith(matrix.runs_on, 'ubuntu') }}

0 commit comments

Comments
 (0)