Skip to content

Commit daaa8ce

Browse files
Evagan2018Evagan2018
authored
Updated actions and tool versions. Simplified workflows.
- Updated actions and tool versions. - Simplified workflows.
1 parent a799ed8 commit daaa8ce

6 files changed

Lines changed: 157 additions & 162 deletions

File tree

‎.ci/vcpkg-configuration.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
}
88
],
99
"requires": {
10-
"arm:tools/open-cmsis-pack/cmsis-toolbox": "^2.14.0",
10+
"arm:tools/open-cmsis-pack/cmsis-toolbox": "^2.14.1",
1111
"arm:tools/kitware/cmake": "^4.3.3",
1212
"arm:tools/ninja-build/ninja": "^1.13.2",
1313
"arm:compilers/arm/armclang": "^6.24.0",

‎.github/workflows/CubeMX-CI.yml‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
1-
name: "CubeMX: Test Build"
2-
on:
3-
workflow_dispatch:
4-
pull_request:
5-
branches: [main]
6-
paths:
7-
- CubeMX/**
8-
- .github/workflows/CubeMX-CI.yml
9-
push:
10-
branches: [main]
11-
paths:
12-
- CubeMX/**
13-
- .github/workflows/CubeMX-CI.yml
14-
schedule:
15-
- cron: '00 20 * * 6'
16-
17-
jobs:
18-
Build:
19-
runs-on: ubuntu-latest
20-
21-
steps:
22-
- name: Checkout repo
23-
uses: actions/checkout@v7
24-
25-
- name: Install tools
26-
uses: ARM-software/cmsis-actions/vcpkg@v1.3
27-
with:
28-
config: ".ci/vcpkg-configuration.json"
29-
30-
- name: Activate Arm tool license
31-
uses: ARM-software/cmsis-actions/armlm@v1.3
32-
33-
- name: Build project with AC6
34-
working-directory: ./CubeMX/
35-
run: cbuild CubeMX.csolution.yml --packs --toolchain AC6 --rebuild
1+
name: "CubeMX: Test Build"
2+
on:
3+
workflow_dispatch:
4+
pull_request:
5+
branches: [main]
6+
paths:
7+
- CubeMX/**
8+
- .github/workflows/CubeMX-CI.yml
9+
push:
10+
branches: [main]
11+
paths:
12+
- CubeMX/**
13+
- .github/workflows/CubeMX-CI.yml
14+
schedule:
15+
- cron: '00 20 * * 6'
16+
17+
jobs:
18+
Build:
19+
runs-on: ubuntu-latest
20+
21+
steps:
22+
- name: Checkout repo
23+
uses: actions/checkout@v7
24+
25+
- name: Install tools
26+
uses: ARM-software/cmsis-actions/vcpkg@v1
27+
with:
28+
config: ".ci/vcpkg-configuration.json"
29+
30+
- name: Activate Arm tool license
31+
uses: ARM-software/cmsis-actions/armlm@v1
32+
33+
- name: Build project with AC6
34+
working-directory: ./CubeMX/
35+
run: cbuild CubeMX.csolution.yml --packs --toolchain AC6 --rebuild

‎.github/workflows/DualCore-CI.yml‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
1-
name: "DualCore: Test Build"
2-
on:
3-
workflow_dispatch:
4-
pull_request:
5-
branches: [main]
6-
paths:
7-
- DualCore/**
8-
- .github/workflows/DualCore-CI.yml
9-
push:
10-
branches: [main]
11-
paths:
12-
- DualCore/**
13-
- .github/workflows/DualCore-CI.yml
14-
schedule:
15-
- cron: '00 20 * * 6'
16-
17-
jobs:
18-
Build:
19-
runs-on: ubuntu-latest
20-
21-
steps:
22-
- name: Checkout repo
23-
uses: actions/checkout@v7
24-
25-
- name: Install tools
26-
uses: ARM-software/cmsis-actions/vcpkg@v1
27-
with:
28-
config: ".ci/vcpkg-configuration.json"
29-
30-
- name: Activate Arm tool license
31-
uses: ARM-software/cmsis-actions/armlm@v1
32-
33-
- name: Build HelloWorld with AC6 and all contexts
34-
working-directory: ./DualCore/
35-
run: cbuild HelloWorld.csolution.yml --packs --toolchain AC6
36-
37-
- name: Upload HelloWorld AC6 build Artifacts
38-
uses: actions/upload-artifact@v7
39-
with:
40-
name: HelloWorld_AC6
41-
path: |
42-
./DualCore/out/
43-
retention-days: 1
1+
name: "DualCore: Test Build"
2+
on:
3+
workflow_dispatch:
4+
pull_request:
5+
branches: [main]
6+
paths:
7+
- DualCore/**
8+
- .github/workflows/DualCore-CI.yml
9+
push:
10+
branches: [main]
11+
paths:
12+
- DualCore/**
13+
- .github/workflows/DualCore-CI.yml
14+
schedule:
15+
- cron: '00 20 * * 6'
16+
17+
jobs:
18+
Build:
19+
runs-on: ubuntu-latest
20+
21+
steps:
22+
- name: Checkout repo
23+
uses: actions/checkout@v7
24+
25+
- name: Install tools
26+
uses: ARM-software/cmsis-actions/vcpkg@v1
27+
with:
28+
config: ".ci/vcpkg-configuration.json"
29+
30+
- name: Activate Arm tool license
31+
uses: ARM-software/cmsis-actions/armlm@v1
32+
33+
- name: Build HelloWorld with AC6 and all contexts
34+
working-directory: ./DualCore/
35+
run: cbuild HelloWorld.csolution.yml --packs --toolchain AC6
36+
37+
- name: Upload HelloWorld AC6 build Artifacts
38+
uses: actions/upload-artifact@v7
39+
with:
40+
name: HelloWorld_AC6
41+
path: |
42+
./DualCore/out/
43+
retention-days: 1

‎.github/workflows/Hello-CI.yml‎

Lines changed: 72 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,72 @@
1-
name: "Hello: Test Build and Execution"
2-
3-
on:
4-
workflow_dispatch:
5-
pull_request:
6-
branches: [main]
7-
paths:
8-
- Hello/**
9-
- .github/workflows/Hello-CI.yml
10-
push:
11-
branches: [main]
12-
paths:
13-
- Hello/**
14-
- .github/workflows/Hello-CI.yml
15-
schedule:
16-
- cron: '00 20 * * 6'
17-
18-
concurrency:
19-
group: ${{ github.workflow }}-${{ github.ref }}
20-
cancel-in-progress: true
21-
22-
permissions: read-all
23-
24-
jobs:
25-
build-and-test:
26-
runs-on: ubuntu-latest
27-
strategy:
28-
matrix:
29-
toolchain: [AC6, GCC, CLANG]
30-
build_type: [Debug, Release]
31-
32-
steps:
33-
- name: Harden the runner (Audit all outbound calls)
34-
uses: step-security/harden-runner@e3f713f2d8f53843e71c69a996d56f51aa9adfb9 # v2.14.1
35-
with:
36-
egress-policy: audit
37-
38-
- name: Checkout repo
39-
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
40-
41-
- name: Install tools
42-
uses: ARM-software/cmsis-actions/vcpkg@75fd924d583d17eacdbfaf77f21ca09e335c3c79 # v1
43-
with:
44-
config: ".ci/vcpkg-configuration.json"
45-
46-
- name: Activate Arm tool license
47-
uses: ARM-software/cmsis-actions/armlm@75fd924d583d17eacdbfaf77f21ca09e335c3c79 # v1
48-
49-
- name: Set up Python
50-
uses: actions/setup-python@v6
51-
with:
52-
python-version: '3.13'
53-
54-
- name: Build Hello with ${{ matrix.toolchain }}
55-
working-directory: ./Hello/
56-
run: |
57-
echo "Building with toolchain: ${{ matrix.toolchain }}"
58-
cbuild Hello.csolution.yml --packs --toolchain ${{ matrix.toolchain }}
59-
60-
- name: Run Hello Simulation ${{ matrix.toolchain }}-${{ matrix.build_type }}
61-
working-directory: ./Hello/
62-
run: |
63-
# Determine file extension
64-
EXT="elf"
65-
if [[ "${{ matrix.toolchain }}" == "AC6" ]]; then EXT="axf"; fi
66-
67-
EXEC=./out/Hello/CS300/${{ matrix.build_type }}/Hello.${EXT}
68-
LOG=./out/Hello/CS300/${{ matrix.build_type }}/${{ matrix.toolchain }}_fvp_stdout.log
69-
70-
FVP_Corstone_SSE-300 \
71-
-a $EXEC \
72-
-f ./../FVP/FVP_Corstone_SSE-300/fvp_config.txt \
73-
-C mps3_board.uart0.out_file=$LOG \
74-
--simlimit 60 --stat
75-
76-
echo "Show simulation UART output for ${{ matrix.toolchain }} ${{ matrix.build_type }}"
77-
cat $LOG
1+
name: "Hello: Test Build and Execution"
2+
3+
on:
4+
workflow_dispatch:
5+
pull_request:
6+
branches: [main]
7+
paths:
8+
- Hello/**
9+
- .github/workflows/Hello-CI.yml
10+
push:
11+
branches: [main]
12+
paths:
13+
- Hello/**
14+
- .github/workflows/Hello-CI.yml
15+
schedule:
16+
- cron: '00 20 * * 6'
17+
18+
concurrency:
19+
group: ${{ github.workflow }}-${{ github.ref }}
20+
cancel-in-progress: true
21+
22+
permissions: read-all
23+
24+
jobs:
25+
build-and-test:
26+
runs-on: ubuntu-latest
27+
strategy:
28+
matrix:
29+
toolchain: [AC6, GCC, CLANG]
30+
build_type: [Debug, Release]
31+
32+
steps:
33+
- name: Checkout repo
34+
uses: actions/checkout@v7
35+
36+
- name: Install tools
37+
uses: ARM-software/cmsis-actions/vcpkg@v1
38+
with:
39+
config: ".ci/vcpkg-configuration.json"
40+
41+
- name: Activate Arm tool license
42+
uses: ARM-software/cmsis-actions/armlm@v1
43+
44+
- name: Set up Python
45+
uses: actions/setup-python@v7
46+
with:
47+
python-version: '3.14'
48+
49+
- name: Build Hello with ${{ matrix.toolchain }}
50+
working-directory: ./Hello/
51+
run: |
52+
echo "Building with toolchain: ${{ matrix.toolchain }}"
53+
cbuild Hello.csolution.yml --packs --toolchain ${{ matrix.toolchain }}
54+
55+
- name: Run Hello Simulation ${{ matrix.toolchain }}-${{ matrix.build_type }}
56+
working-directory: ./Hello/
57+
run: |
58+
# Determine file extension
59+
EXT="elf"
60+
if [[ "${{ matrix.toolchain }}" == "AC6" ]]; then EXT="axf"; fi
61+
62+
EXEC=./out/Hello/CS300/${{ matrix.build_type }}/Hello.${EXT}
63+
LOG=./out/Hello/CS300/${{ matrix.build_type }}/${{ matrix.toolchain }}_fvp_stdout.log
64+
65+
FVP_Corstone_SSE-300 \
66+
-a $EXEC \
67+
-f ./../FVP/FVP_Corstone_SSE-300/fvp_config.txt \
68+
-C mps3_board.uart0.out_file=$LOG \
69+
--simlimit 60 --stat
70+
71+
echo "Show simulation UART output for ${{ matrix.toolchain }} ${{ matrix.build_type }}"
72+
cat $LOG

‎.github/workflows/SimpleTZ-CI.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ jobs:
4242
uses: ARM-software/cmsis-actions/armlm@v1
4343

4444
- name: Set up Python
45-
uses: actions/setup-python@v6
45+
uses: actions/setup-python@v7
4646
with:
47-
python-version: '3.13'
47+
python-version: '3.14'
4848

4949
- name: Build project CM33_s and CM33_ns for build-type ${{ matrix.build.type }} with ${{ matrix.compiler.name }}
5050
working-directory: ./SimpleTrustZone/

‎vcpkg-configuration.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
}
88
],
99
"requires": {
10-
"arm:tools/open-cmsis-pack/cmsis-toolbox": "^2.13.0",
11-
"arm:tools/kitware/cmake": "^3.31.5",
10+
"arm:tools/open-cmsis-pack/cmsis-toolbox": "^2.14.1",
11+
"arm:tools/kitware/cmake": "^4.3.3",
1212
"arm:tools/ninja-build/ninja": "^1.13.2",
1313
"arm:compilers/arm/armclang": "^6.24.0",
14-
"arm:compilers/arm/arm-none-eabi-gcc": "^14.2.1",
15-
"arm:compilers/arm/llvm-embedded": "^20.1.0",
14+
"arm:compilers/arm/arm-none-eabi-gcc": "^15.3.1",
15+
"arm:compilers/arm/llvm-embedded": "^22.1.0",
1616
"arm:models/arm/avh-fvp": "^11.31.28"
1717
}
1818
}

0 commit comments

Comments
 (0)