Skip to content

Commit 7d32102

Browse files
authored
Workflow cleanup
1 parent 44f4974 commit 7d32102

File tree

9 files changed

+26
-18
lines changed

9 files changed

+26
-18
lines changed

.github/workflows/buildmgr.yml

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,7 @@ on:
2424
- '.github/workflows/buildmgr.yml'
2525
- '.github/matrix_includes_buildmgr.json'
2626
- 'CMakeLists.txt'
27-
- 'libs/crossplatform/**'
28-
- 'libs/errlog/**'
29-
- 'libs/xmlreader/**'
30-
- 'libs/xmltree/**'
31-
- 'libs/xmltreeslim/**'
32-
- 'libs/rteutils/**'
33-
- 'libs/rtemodel/**'
34-
- 'libs/rtefsutils/**'
27+
- 'libs/**'
3528
- 'tools/buildmgr/**'
3629
- '!**/docs/**/*'
3730
- '!**/*.md'
@@ -55,6 +48,7 @@ jobs:
5548
workflow_name: buildmgr
5649

5750
build:
51+
name: build (${{ matrix.runs_on }}, ${{ matrix.arch }})
5852
needs: [ setup, matrix_prep ]
5953
runs-on: ${{ matrix.runs_on }}
6054
timeout-minutes: 15
@@ -96,7 +90,7 @@ jobs:
9690
github.event_name == 'release' &&
9791
(startsWith(matrix.runs_on, 'macos') || startsWith(matrix.runs_on, 'ubuntu'))
9892
run: |
99-
binary_path="./build/tools/buildmgr/cbuildgen/${{ matrix.target }}-${{ matrix.arch }}/Release/cbuildgen${{ matrix.binary_extension }}"
93+
binary_path="./build/tools/buildmgr/cbuildgen/${{ matrix.target }}-${{ matrix.arch }}/Release/cbuildgen${{ matrix.binary_extension }}"
10094
echo "Stripping binary at: $binary_path"
10195
# Use appropriate strip tool based on architecture and target
10296
if [[ "${{ matrix.arch }}" == "arm64" && "${{ matrix.target }}" == "linux" ]]; then
@@ -164,7 +158,7 @@ jobs:
164158
id: var
165159
run: |
166160
echo "retention_days=$(echo '${{ (!github.event.repository.private && (github.event_name == 'push' || github.event.schedule != '')) && '7' || '1' }}')" >> $GITHUB_OUTPUT
167-
161+
168162
- name: Upload documentation
169163
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
170164
with:
@@ -338,10 +332,11 @@ jobs:
338332
tag: ${{ github.ref }}
339333
overwrite: true
340334

341-
tests:
335+
test:
342336
needs: [ setup, matrix_prep, create_installer ]
343337
timeout-minutes: 15
344338
runs-on: ${{ matrix.runs_on }}
339+
name: test (${{ matrix.runs_on }}, ${{ matrix.arch }})
345340
env:
346341
arm_gcc_install_base: ${{ matrix.arm_gcc_install_base }}
347342
CI_CBUILD_DEB_PKG: ${{ github.workspace }}
@@ -631,6 +626,7 @@ jobs:
631626
needs: [ matrix_prep, create_installer ]
632627
timeout-minutes: 15
633628
runs-on: ${{ matrix.runs_on }}
629+
name: sanity check native (${{ matrix.runs_on }}, ${{ matrix.arch }})
634630
env:
635631
CMSIS_PACK_ROOT: ${{ github.workspace }}/packs
636632
AC6_TOOLCHAIN_ROOT: ""
@@ -669,6 +665,7 @@ jobs:
669665
shell: bash
670666
run: |
671667
${{ github.workspace }}/cbuild/bin/cbuildgen | grep "(cbuildgen): Build Process Manager"
668+
672669
sanity-check-docker:
673670
needs: create_installer
674671
timeout-minutes: 15
@@ -717,7 +714,7 @@ jobs:
717714
718715
test-results-preparation:
719716
name: "Publish Tests Results"
720-
needs: [ tests ]
717+
needs: [ test ]
721718
runs-on: ubuntu-22.04
722719
steps:
723720
- name: Harden Runner

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
languages: cpp
4545
queries: security-and-quality
4646
config-file: ./.github/codeql-config.yml
47-
47+
4848
- name: Create build folder
4949
run: mkdir build
5050

.github/workflows/packchk.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ jobs:
5555
build:
5656
needs: [ setup, matrix_prep ]
5757
runs-on: ${{ matrix.runs_on }}
58+
name: build (${{ matrix.runs_on }}, ${{ matrix.arch }})
5859
timeout-minutes: 15
5960
strategy:
6061
fail-fast: true
@@ -105,7 +106,7 @@ jobs:
105106
shell: bash
106107
working-directory: build/tools/packchk/
107108
run: |
108-
mkdir -p packchk_release_bin
109+
mkdir -p packchk_release_bin
109110
110111
# Extract the binary tarball into the release directory
111112
tar -xvf packchk-*-${{ matrix.target }}-${{ matrix.arch }}.tbz2 -C packchk_release_bin
@@ -143,6 +144,7 @@ jobs:
143144
test:
144145
needs: [ setup, matrix_prep ]
145146
runs-on: ${{ matrix.runs_on }}
147+
name: test (${{ matrix.runs_on }}, ${{ matrix.arch }})
146148
timeout-minutes: 15
147149
strategy:
148150
fail-fast: false

.github/workflows/packgen.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ jobs:
5050
build:
5151
needs: [ setup, matrix_prep ]
5252
runs-on: ${{ matrix.runs_on }}
53+
name: build (${{ matrix.runs_on }}, ${{ matrix.arch }})
5354
timeout-minutes: 15
5455
strategy:
5556
fail-fast: true
@@ -89,7 +90,7 @@ jobs:
8990
github.event_name == 'release' &&
9091
(startsWith(matrix.runs_on, 'macos') || startsWith(matrix.runs_on, 'ubuntu'))
9192
run: |
92-
binary_path="./build/tools/packgen/${{ matrix.target }}-${{ matrix.arch }}/Release/${{ matrix.binary }}"
93+
binary_path="./build/tools/packgen/${{ matrix.target }}-${{ matrix.arch }}/Release/${{ matrix.binary }}"
9394
echo "Stripping binary at: $binary_path"
9495
# Use appropriate strip tool based on architecture and target
9596
if [[ "${{ matrix.arch }}" == "arm64" && "${{ matrix.target }}" == "linux" ]]; then
@@ -177,6 +178,7 @@ jobs:
177178

178179
unittest:
179180
needs: [ setup, matrix_prep ]
181+
name: unittest (${{ matrix.runs_on }}, ${{ matrix.arch }})
180182
runs-on: ${{ matrix.runs_on }}
181183
timeout-minutes: 15
182184
strategy:

.github/workflows/projmgr.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ jobs:
5555
build:
5656
needs: [ setup, matrix_prep ]
5757
runs-on: ${{ matrix.runs_on }}
58+
name: build (${{ matrix.runs_on }},${{ matrix.arch }})
5859
timeout-minutes: 15
5960
strategy:
6061
# fail-fast: true
@@ -94,7 +95,7 @@ jobs:
9495
github.event_name == 'release' &&
9596
(startsWith(matrix.runs_on, 'macos') || startsWith(matrix.runs_on, 'ubuntu'))
9697
run: |
97-
binary_path="./build/tools/projmgr/${{ matrix.target }}-${{ matrix.arch }}/Release/${{ matrix.binary }}"
98+
binary_path="./build/tools/projmgr/${{ matrix.target }}-${{ matrix.arch }}/Release/${{ matrix.binary }}"
9899
echo "Stripping binary at: $binary_path"
99100
# Use appropriate strip tool based on architecture and target
100101
if [[ "${{ matrix.arch }}" == "arm64" && "${{ matrix.target }}" == "linux" ]]; then
@@ -131,6 +132,7 @@ jobs:
131132

132133
build-swig:
133134
needs: [ setup, matrix_prep ]
135+
name: build-swig (${{ matrix.runs_on }}, ${{ matrix.arch }})
134136
runs-on: ${{ matrix.runs_on }}
135137
timeout-minutes: 15
136138
strategy:
@@ -358,6 +360,7 @@ jobs:
358360

359361
unittest:
360362
needs: [ setup, matrix_prep ]
363+
name: unittest (${{ matrix.runs_on }}, ${{ matrix.arch }})
361364
runs-on: ${{ matrix.runs_on }}
362365
timeout-minutes: 15
363366
strategy:

.github/workflows/scorecard.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ permissions: read-all
1616

1717
jobs:
1818
analysis:
19+
if: github.repository == 'Open-CMSIS-Pack/devtools'
1920
name: Scorecard analysis
2021
runs-on: ubuntu-latest
2122
permissions:

.github/workflows/shared_setup_env.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
inputs:
66
run_if:
77
description: 'True if workflow needs to run'
8-
default: false
8+
default: false
99
required: true
1010
type: boolean
1111
outputs:

.github/workflows/svdconv.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ jobs:
4646

4747
build:
4848
needs: [ setup, matrix_prep ]
49+
name: build (${{ matrix.runs_on }}, ${{ matrix.arch }})
4950
runs-on: ${{ matrix.runs_on }}
5051
timeout-minutes: 15
5152
strategy:
@@ -101,7 +102,7 @@ jobs:
101102
tar -xvf svdconv-*-${{ matrix.target }}-${{ matrix.arch }}.tbz2 -C svdconv_release_bin
102103
103104
# Construct the path to the extracted binary
104-
binary_path="./svdconv_release_bin/${{ matrix.binary }}"
105+
binary_path="./svdconv_release_bin/${{ matrix.binary }}"
105106
echo "Stripping binary at: $binary_path"
106107
107108
# Use appropriate strip tool based on architecture and target
@@ -132,6 +133,7 @@ jobs:
132133

133134
test:
134135
needs: [ setup, matrix_prep ]
136+
name: test (${{ matrix.runs_on }}, ${{ matrix.arch }})
135137
runs-on: ${{ matrix.runs_on }}
136138
timeout-minutes: 15
137139
strategy:

.github/workflows/test_libs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ jobs:
4040

4141
test_libs:
4242
runs-on: ${{ matrix.runs_on }}
43+
name: test_libs (${{ matrix.runs_on }}, ${{ matrix.arch }})
4344
needs: [ setup, matrix_prep ]
4445
timeout-minutes: 15
4546
strategy:

0 commit comments

Comments
 (0)