Skip to content

Reverting to build matrix approach #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
soumeh01 merged 1 commit into from
Jan 15, 2026
Merged

Reverting to build matrix approach #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
195 changes: 0 additions & 195 deletions .github/scripts/run-tests.sh
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions .github/test-matrix.json
View file
Open in desktop

This file was deleted.

68 changes: 54 additions & 14 deletions .github/workflows/hello-ci-ubuntu-2404-arm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,41 @@ env:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true # Cancel previous runs on new push
cancel-in-progress: true

jobs:
install_build_execute:
runs-on: ubuntu-24.04-arm

strategy:
fail-fast: false
matrix:
compiler: [
{name: AC6, ext: axf},
{name: GCC, ext: elf}
]
target: [
{type: CM0, model: FVP_MPS2_Cortex-M0, uart: fvp_mps2.UART0},
{type: CM0plus, model: FVP_MPS2_Cortex-M0plus, uart: fvp_mps2.UART0},
{type: CM3, model: FVP_MPS2_Cortex-M3, uart: fvp_mps2.UART0},
{type: CM4, model: FVP_MPS2_Cortex-M4, uart: fvp_mps2.UART0},
{type: CM4_FP, model: FVP_MPS2_Cortex-M4, uart: fvp_mps2.UART0},
{type: CM7, model: FVP_MPS2_Cortex-M7, uart: fvp_mps2.UART0},
{type: CM7_SP, model: FVP_MPS2_Cortex-M7, uart: fvp_mps2.UART0},
{type: CM7_DP, model: FVP_MPS2_Cortex-M7, uart: fvp_mps2.UART0},
{type: CM23, model: FVP_MPS2_Cortex-M23, uart: fvp_mps2.UART0},
{type: CM33, model: FVP_MPS2_Cortex-M33, uart: fvp_mps2.UART0},
{type: CM33_FP, model: FVP_MPS2_Cortex-M33, uart: fvp_mps2.UART0},
{type: CS300, model: FVP_Corstone_SSE-300, uart: mps3_board.uart0},
{type: CS310, model: FVP_Corstone_SSE-310, uart: mps3_board.uart0},
{type: CS315, model: FVP_Corstone_SSE-315, uart: mps4_board.uart0},
{type: CS320, model: FVP_Corstone_SSE-320, uart: mps4_board.uart0}
]
build: [
{type: Release},
{type: Debug}
]

steps:
- name: Checkout repo
uses: actions/checkout@v6
Expand All @@ -35,21 +64,32 @@ jobs:
- name: Cache packs
uses: actions/cache@v5
with:
key: cmsis-packs-${{ hashFiles('*.csolution.yml', '*.cproject.yml') }}
restore-keys: |
cmsis-packs-
key: cmsis-packs
path: /home/runner/.cache/arm/packs

- name: Build and Execute All Configurations
- name: Build context Hello.${{ matrix.build.type }}+${{ matrix.target.type }} with ${{ matrix.compiler.name }}
working-directory: ./
run: |
chmod +x .github/scripts/run-tests.sh
.github/scripts/run-tests.sh .github/test-matrix.json
cbuild Hello.csolution.yml --packs \
--context Hello.${{ matrix.build.type }}+${{ matrix.target.type }} \
--toolchain ${{ matrix.compiler.name }} --rebuild

- name: Upload Failed Test Logs
if: failure()
uses: actions/upload-artifact@v6
with:
name: failed-test-logs-${{ github.workflow }}
path: logs/
retention-days: 30
- name: Execute context Hello.${{ matrix.build.type }}+${{ matrix.target.type }} with ${{ matrix.compiler.name }}
working-directory: ./
run: |
${{ matrix.target.model }} \
-a ./out/Hello/${{ matrix.target.type }}/${{ matrix.build.type }}/${{ matrix.compiler.name }}/Hello.${{ matrix.compiler.ext }} \
-f ./FVP/${{ matrix.target.model }}/fvp_config.txt \
-C ${{ matrix.target.uart }}.out_file=./out/Hello/${{ matrix.target.type }}/${{ matrix.build.type }}/${{ matrix.compiler.name }}/fvp_stdout.log \
--simlimit 60 --stat

echo " Show simulation UART output"
cat ./out/Hello/${{ matrix.target.type }}/${{ matrix.build.type }}/${{ matrix.compiler.name }}/fvp_stdout.log

echo "Checking simulation UART output"
if [ "$(grep -c "Hello World 100" ./out/Hello/${{ matrix.target.type }}/${{ matrix.build.type }}/${{ matrix.compiler.name }}/fvp_stdout.log)" -eq 1 ]
then
exit 0
else
exit 1
fi
70 changes: 55 additions & 15 deletions .github/workflows/hello-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,41 @@ on:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true # Cancel previous runs on new push
cancel-in-progress: true

jobs:
build_and_test:
install_build_execute:
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
compiler: [
{name: AC6, ext: axf},
{name: GCC, ext: elf}
]
target: [
{type: CM0, model: FVP_MPS2_Cortex-M0, uart: fvp_mps2.UART0},
{type: CM0plus, model: FVP_MPS2_Cortex-M0plus, uart: fvp_mps2.UART0},
{type: CM3, model: FVP_MPS2_Cortex-M3, uart: fvp_mps2.UART0},
{type: CM4, model: FVP_MPS2_Cortex-M4, uart: fvp_mps2.UART0},
{type: CM4_FP, model: FVP_MPS2_Cortex-M4, uart: fvp_mps2.UART0},
{type: CM7, model: FVP_MPS2_Cortex-M7, uart: fvp_mps2.UART0},
{type: CM7_SP, model: FVP_MPS2_Cortex-M7, uart: fvp_mps2.UART0},
{type: CM7_DP, model: FVP_MPS2_Cortex-M7, uart: fvp_mps2.UART0},
{type: CM23, model: FVP_MPS2_Cortex-M23, uart: fvp_mps2.UART0},
{type: CM33, model: FVP_MPS2_Cortex-M33, uart: fvp_mps2.UART0},
{type: CM33_FP, model: FVP_MPS2_Cortex-M33, uart: fvp_mps2.UART0},
{type: CS300, model: FVP_Corstone_SSE-300, uart: mps3_board.uart0},
{type: CS310, model: FVP_Corstone_SSE-310, uart: mps3_board.uart0},
{type: CS315, model: FVP_Corstone_SSE-315, uart: mps4_board.uart0},
{type: CS320, model: FVP_Corstone_SSE-320, uart: mps4_board.uart0}
]
build: [
{type: Release},
{type: Debug}
]

steps:
- name: Checkout repo
uses: actions/checkout@v6
Expand All @@ -30,21 +59,32 @@ jobs:
- name: Cache packs
uses: actions/cache@v5
with:
key: cmsis-packs-${{ hashFiles('*.csolution.yml', '*.cproject.yml') }}
restore-keys: |
cmsis-packs-
key: cmsis-packs
path: /home/runner/.cache/arm/packs

- name: Build and Execute All Configurations
- name: Build context Hello.${{ matrix.build.type }}+${{ matrix.target.type }} with ${{ matrix.compiler.name }}
working-directory: ./
run: |
chmod +x .github/scripts/run-tests.sh
.github/scripts/run-tests.sh .github/test-matrix.json
cbuild Hello.csolution.yml --packs \
--context Hello.${{ matrix.build.type }}+${{ matrix.target.type }} \
--toolchain ${{ matrix.compiler.name }} --rebuild

- name: Upload Failed Test Logs
if: failure()
uses: actions/upload-artifact@v6
with:
name: failed-test-logs-${{ github.workflow }}
path: logs/
retention-days: 30
- name: Execute context Hello.${{ matrix.build.type }}+${{ matrix.target.type }} with ${{ matrix.compiler.name }}
working-directory: ./
run: |
${{ matrix.target.model }} \
-a ./out/Hello/${{ matrix.target.type }}/${{ matrix.build.type }}/${{ matrix.compiler.name }}/Hello.${{ matrix.compiler.ext }} \
-f ./FVP/${{ matrix.target.model }}/fvp_config.txt \
-C ${{ matrix.target.uart }}.out_file=./out/Hello/${{ matrix.target.type }}/${{ matrix.build.type }}/${{ matrix.compiler.name }}/fvp_stdout.log \
--simlimit 60 --stat

echo " Show simulation UART output"
cat ./out/Hello/${{ matrix.target.type }}/${{ matrix.build.type }}/${{ matrix.compiler.name }}/fvp_stdout.log

echo "Checking simulation UART output"
if [ "$(grep -c "Hello World 100" ./out/Hello/${{ matrix.target.type }}/${{ matrix.build.type }}/${{ matrix.compiler.name }}/fvp_stdout.log)" -eq 1 ]
then
exit 0
else
exit 1
fi