Skip to content

Commit cba4ae6

Browse files
committed
Fix build errors due to incorrect toolchain use
1 parent 28db9ea commit cba4ae6

1 file changed

Lines changed: 16 additions & 3 deletions

File tree

.gitlab/.gitlab-ci.yml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,10 @@ default:
7474

7575
.pico_sdk_cache:
7676
cache:
77+
- key: arm-gnu-toolchain-13.2
78+
paths:
79+
- arm-gnu-toolchain/
80+
policy: pull-push
7781
- key: pico-sdk-${PICO_SDK_REF}
7882
paths:
7983
- pico-sdk/
@@ -98,9 +102,18 @@ default:
98102
before_script:
99103
# Install base dependencies
100104
- apt-get update
101-
- apt-get install -y build-essential cmake ninja-build git python3 python3-pip wget curl
102-
# Install ARM toolchain
103-
- apt-get install -y gcc-arm-none-eabi libnewlib-arm-none-eabi libstdc++-arm-none-eabi-newlib
105+
- apt-get install -y build-essential cmake ninja-build git python3 python3-pip wget curl xz-utils
106+
# Install ARM toolchain (13.2 Rel1 — same as GitHub Actions carlosperate/arm-none-eabi-gcc-action@v1)
107+
- |
108+
ARM_GCC_DIR="${CI_PROJECT_DIR}/arm-gnu-toolchain"
109+
if [ ! -x "${ARM_GCC_DIR}/bin/arm-none-eabi-gcc" ]; then
110+
wget -q "https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-x86_64-arm-none-eabi.tar.xz" -O /tmp/arm-gcc.tar.xz
111+
mkdir -p "${ARM_GCC_DIR}"
112+
tar xf /tmp/arm-gcc.tar.xz -C "${ARM_GCC_DIR}" --strip-components=1
113+
rm /tmp/arm-gcc.tar.xz
114+
fi
115+
- export PATH="${CI_PROJECT_DIR}/arm-gnu-toolchain/bin:${PATH}"
116+
- arm-none-eabi-gcc --version
104117
# Install xa65 and bin2h for SID player builds
105118
- |
106119
if [ "${WITH_SIDPLAYER}" = "1" ]; then

0 commit comments

Comments
 (0)