Skip to content

Commit 3f809c7

Browse files
soumeh01JonatanAntoni
authored andcommitted
Investigate
1 parent 9f61109 commit 3f809c7

File tree

2 files changed

+11
-25
lines changed

2 files changed

+11
-25
lines changed

.github/workflows/corevalidation.yml

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@ on:
1010
- CMSIS/CoreValidation/**/*
1111
push:
1212
branches: [main]
13-
13+
1414
concurrency:
1515
group: ${{ github.workflow }}-${{ github.ref }}
1616
cancel-in-progress: true
1717

1818
jobs:
1919
build-and-run:
20-
20+
2121
strategy:
2222
fail-fast: true
2323
matrix:
2424
compiler: [IAR]
25-
25+
2626
runs-on: ubuntu-22.04
2727

2828
env:
@@ -50,7 +50,7 @@ jobs:
5050
5151
- uses: actions/setup-python@v5
5252
with:
53-
python-version: '3.10'
53+
python-version: '3.10'
5454
cache: 'pip'
5555

5656
- name: Python requirements
@@ -63,33 +63,17 @@ jobs:
6363
run: |
6464
sudo apt-get update
6565
sudo apt-get install libtinfo5
66-
67-
- name: Install IAR Toolchain
68-
if: matrix.compiler == 'IAR'
69-
working-directory: /home/runner
70-
run: |
71-
curl -sLO https://github.com/iarsystems/arm/releases/download/9.70.1/cxarm-9.70.1-linux-x86_64-base.tar.bz2
72-
tar -xjf cxarm-9.70.1-linux-x86_64-base.tar.bz2
73-
echo "PATH=$PATH:$(pwd)/cxarm-9.70.1/arm/bin" >> $GITHUB_ENV
74-
echo "IAR_TOOLCHAIN_9_70_1=$(pwd)/cxarm-9.70.1/arm/bin" >> $GITHUB_ENV
75-
7666
7767
- name: Activate vcpkg environment
7868
uses: ARM-software/cmsis-actions/vcpkg@v1
7969
with:
8070
config: ./CMSIS/CoreValidation/Project/vcpkg-configuration.json
81-
82-
- name: Inspect IAR Toolchain
83-
run: |
84-
iccarm --version
85-
ilinkarm --version
86-
iarchive --version
8771

8872
- name: Activate Arm tool license
8973
uses: ARM-software/cmsis-actions/armlm@v1
9074
with:
9175
code: "${{ env.ARM_UBL_ACTIVATION_CODE }}"
92-
76+
9377
- name: Initialize CodeQL
9478
if: matrix.compiler == 'GCC'
9579
uses: github/codeql-action/init@v3
@@ -102,6 +86,7 @@ jobs:
10286

10387
- name: Build
10488
working-directory: ./CMSIS/CoreValidation/Project
89+
shell: bash
10590
run: |
10691
echo "Register local Cortex_DFP pack"
10792
cpackget add /home/runner/Cortex_DFP/ARM.Cortex_DFP.pdsc
@@ -115,7 +100,7 @@ jobs:
115100

116101
- name: Execute
117102
working-directory: ./CMSIS/CoreValidation/Project
118-
run: |
103+
run: |
119104
echo "Run test projects ..."
120105
./build.py --verbose -c ${{ matrix.compiler }} -d "CM*" run || echo "::warning::==== Some configurations failed to run! ==="
121106

CMSIS/CoreValidation/Project/vcpkg-configuration.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@
77
}
88
],
99
"requires": {
10-
"arm:tools/kitware/cmake": "^3.31.5",
10+
"arm:tools/kitware/cmake": "3.31.5",
1111
"arm:compilers/arm/armclang": "6.23.0",
1212
"arm:compilers/arm/arm-none-eabi-gcc": "14.2.1",
1313
"arm:compilers/arm/llvm-embedded": "19.1.5",
1414
"arm:tools/open-cmsis-pack/cmsis-toolbox": "2.9.0",
1515
"arm:models/arm/avh-fvp": "11.27.31",
16-
"arm:tools/ninja-build/ninja": "1.12.0"
16+
"arm:tools/ninja-build/ninja": "1.12.0",
17+
"arm:compilers/iar/cxarm": "9.60.4"
1718
}
18-
}
19+
}

0 commit comments

Comments
 (0)