Skip to content

Commit 8297a13

Browse files
committed
try to run arm-iar with circleci with new token
1 parent dbc2c8d commit 8297a13

File tree

3 files changed

+24
-13
lines changed

3 files changed

+24
-13
lines changed

.circleci/config.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,14 @@ jobs:
1919
echo "MATRIX_JSON=$MATRIX_JSON"
2020
2121
BUILDSYSTEM_TOOLCHAIN=(
22-
"cmake arm-clang"
23-
"make aarch64-gcc"
24-
"make arm-gcc"
25-
"make msp430-gcc"
26-
"make riscv-gcc"
27-
"make rx-gcc"
28-
"cmake esp-idf"
22+
#"cmake arm-clang"
23+
"cmake arm-iar"
24+
#"make aarch64-gcc"
25+
#"make arm-gcc"
26+
#"make msp430-gcc"
27+
#"make riscv-gcc"
28+
#"make rx-gcc"
29+
#"cmake esp-idf"
2930
)
3031
3132
RESOURCE_LARGE='["nrf", "imxrt"]'

.circleci/config2.yml

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ commands:
1616
"arm-gcc": "https://github.com/xpack-dev-tools/arm-none-eabi-gcc-xpack/releases/download/v13.2.1-1.1/xpack-arm-none-eabi-gcc-13.2.1-1.1-linux-x64.tar.gz",
1717
"msp430-gcc": "http://software-dl.ti.com/msp430/msp430_public_sw/mcu/msp430/MSPGCC/9_2_0_0/export/msp430-gcc-9.2.0.50_linux64.tar.bz2",
1818
"riscv-gcc": "https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack/releases/download/v13.2.0-2/xpack-riscv-none-elf-gcc-13.2.0-2-linux-x64.tar.gz",
19-
"rx-gcc": "https://llvm-gcc-renesas.com/downloads/get.php?f=rx/8.3.0.202004-gnurx/gcc-8.3.0.202004-GNURX-ELF.run"
19+
"rx-gcc": "https://llvm-gcc-renesas.com/downloads/get.php?f=rx/8.3.0.202004-gnurx/gcc-8.3.0.202004-GNURX-ELF.run",
20+
"arm-iar": "https://updates.iar.com/FileStore/STANDARD/001/003/322/cxarm-9.60.3.deb"
2021
}'
2122
toolchain_url=$(echo $TOOLCHAIN_JSON | jq -r '.["<< parameters.toolchain >>"]')
2223
@@ -38,18 +39,26 @@ commands:
3839
# download if folder does not exist (not cached)
3940
if [ ! -d ~/cache/<< parameters.toolchain >> ]; then
4041
mkdir -p ~/cache/<< parameters.toolchain >>
41-
wget --progress=dot:giga $toolchain_url -O toolchain.tar.gz
4242
if [[ << parameters.toolchain >> == rx-gcc ]]; then
43-
mv toolchain.tar.gz toolchain.run
43+
wget --progress=dot:giga $toolchain_url -O toolchain.run
4444
chmod +x toolchain.run
4545
./toolchain.run -p ~/cache/<< parameters.toolchain >>/gnurx -y
46+
elif [[ << parameters.toolchain >> == arm-iar ]]; then
47+
wget --progress=dot:giga $toolchain_url -O ~/cache/<< parameters.toolchain >>/toolchain.deb
4648
else
49+
wget --progress=dot:giga $toolchain_url -O toolchain.tar.gz
4750
tar -C ~/cache/<< parameters.toolchain >> -xaf toolchain.tar.gz
4851
fi
4952
fi
5053
5154
# Add toolchain to PATH
52-
echo "export PATH=$PATH:`echo ~/cache/<< parameters.toolchain >>/*/bin`" >> $BASH_ENV
55+
if [[ << parameters.toolchain >> == arm-iar ]]; then
56+
# Install IAR since we only cache deb file
57+
sudo dpkg --ignore-depends=libusb-1.0-0 -i ~/cache/<< parameters.toolchain >>/toolchain.deb
58+
echo "export PATH=$PATH:/opt/iar/cxarm/arm/bin" >> $BASH_ENV
59+
else
60+
echo "export PATH=$PATH:`echo ~/cache/<< parameters.toolchain >>/*/bin`" >> $BASH_ENV
61+
fi
5362
5463
- save_cache:
5564
name: Save Toolchain Cache
@@ -110,6 +119,8 @@ commands:
110119
# Toolchain option default is gcc
111120
if [ << parameters.toolchain >> == arm-clang ]; then
112121
TOOLCHAIN_OPTION="--toolchain clang"
122+
elif [ << parameters.toolchain >> == arm-iar ]; then
123+
TOOLCHAIN_OPTION="--toolchain iar"
113124
elif [ << parameters.toolchain >> == arm-gcc ]; then
114125
TOOLCHAIN_OPTION="--toolchain gcc"
115126
fi

.github/workflows/build.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,7 @@ jobs:
118118
runs-on: [self-hosted, Linux, X64, hifiphile]
119119
env:
120120
BUILD_ARGS: ${{ join(fromJSON(needs.set-matrix.outputs.json)['arm-iar'], ' ') }}
121-
IAR_LMS_CLOUD_URL: https://license.cloud.iar.com
122-
IAR_LMS_BEARER_TOKEN: ${{ secrets.IAR_LMS_BEARER_TOKEN }}
121+
# IAR_LMS_BEARER_TOKEN: ${{ secrets.IAR_LMS_BEARER_TOKEN }}
123122
steps:
124123
- name: Clean workspace
125124
run: |

0 commit comments

Comments
 (0)