Skip to content

Commit 992e87c

Browse files
committed
change armgcc setup to manual download due to issue with action
1 parent 2e10107 commit 992e87c

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

.github/actions/setup_toolchain/download/action.yml

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ runs:
2626
TOOLCHAIN_URL: ${{ inputs.toolchain_url }}
2727
run: |
2828
mkdir -p ~/cache/${TOOLCHAIN}
29+
FILE_EXT="${TOOLCHAIN_URL##*.}"
2930
3031
if [[ ${TOOLCHAIN} == rx-gcc ]]; then
3132
wget --progress=dot:giga ${TOOLCHAIN_URL} -O toolchain.run
@@ -34,13 +35,16 @@ runs:
3435
elif [[ ${TOOLCHAIN} == arm-iar ]]; then
3536
wget --progress=dot:giga https://netstorage.iar.com/FileStore/STANDARD/001/003/926/iar-lmsc-tools_1.8_amd64.deb -O ~/cache/${TOOLCHAIN}/iar-lmsc-tools.deb
3637
wget --progress=dot:giga ${TOOLCHAIN_URL} -O ~/cache/${TOOLCHAIN}/cxarm.deb
37-
elif [[ ${TOOLCHAIN} == arm-gcc-windows-latest ]]; then
38+
elif [[ ${FILE_EXT} == zip ]]; then
3839
curl -L "$TOOLCHAIN_URL" -o toolchain.zip
3940
unzip -q toolchain.zip -d ~/cache/${TOOLCHAIN}
4041
~/cache/${TOOLCHAIN}/xpack-arm-none-eabi-gcc-14.2.1-1.1/bin/arm-none-eabi-gcc.exe --version
41-
else
42+
elif [[ ${FILE_EXT} == gz ]]; then
4243
wget --progress=dot:giga ${TOOLCHAIN_URL} -O toolchain.tar.gz
4344
tar -C ~/cache/${TOOLCHAIN} -xaf toolchain.tar.gz
45+
else
46+
echo "Unsupported toolchain file extension: ${FILE_EXT}"
47+
exit 1
4448
fi
4549
shell: bash
4650

@@ -51,17 +55,9 @@ runs:
5155
if [[ ${TOOLCHAIN} == arm-iar ]]; then
5256
sudo dpkg -i ~/cache/${TOOLCHAIN}/iar-lmsc-tools.deb
5357
sudo apt install -y ~/cache/${TOOLCHAIN}/cxarm.deb
54-
echo >> $GITHUB_PATH "/opt/iar/cxarm/arm/bin"
58+
TOOLCHAIN_PATH="/opt/iar/cxarm/arm/bin"
5559
else
56-
echo >> $GITHUB_PATH `echo ~/cache/${TOOLCHAIN}/*/bin`
57-
fi
58-
shell: bash
59-
60-
- name: Verify Toolchain
61-
env:
62-
TOOLCHAIN: ${{ inputs.toolchain }}
63-
run: |
64-
if [[ ${TOOLCHAIN} == arm-gcc-windows-latest ]]; then
65-
arm-none-eabi-gcc -dumpversion
60+
TOOLCHAIN_PATH=$(echo ~/cache/${TOOLCHAIN}/*/bin)
6661
fi
62+
echo >> $GITHUB_PATH "$TOOLCHAIN_PATH"
6763
shell: bash

.github/workflows/build_util.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ jobs:
4747
with:
4848
arg: ${{ matrix.arg }}
4949

50+
- name: Install Make (Windows)
51+
if: runner.os == 'Windows'
52+
run: choco install make -y
53+
5054
- name: Set build one-per-family option
5155
id: set-one-per-family
5256
run: |

0 commit comments

Comments
 (0)