diff --git a/.github/workflows/firmware.yml b/.github/workflows/firmware.yml index 16085f3a5..3c35ffc58 100644 --- a/.github/workflows/firmware.yml +++ b/.github/workflows/firmware.yml @@ -44,7 +44,7 @@ jobs: id: cache with: path: ~/cache/gcc - key: 'gcc-arm-none-eabi-10-2020-q4-major' + key: 'arm-gnu-toolchain-13.2.rel1' - name: '🛠 Install toolchain ' if: steps.cache.outputs.cache-hit != 'true' diff --git a/src/micropython b/src/micropython index 64f6f22bb..6e252c7ed 160000 --- a/src/micropython +++ b/src/micropython @@ -1 +1 @@ -Subproject commit 64f6f22bb2b6e6a1345ce94d5e6ce091f1858df3 +Subproject commit 6e252c7edec9393a7b2f07a35997e19690a5d173 diff --git a/tools/ci.sh b/tools/ci.sh index 529a0e5e6..7ce8f3250 100755 --- a/tools/ci.sh +++ b/tools/ci.sh @@ -2,9 +2,8 @@ ######################################################################################## # Install ARM GCC. -TOOLCHAIN="gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2" TOOLCHAIN_PATH=${HOME}/cache/gcc -TOOLCHAIN_URL="https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/10-2020q4/${TOOLCHAIN}" +TOOLCHAIN_URL="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" ci_install_arm_gcc_apt() { sudo apt-get install gcc-arm-none-eabi libnewlib-arm-none-eabi @@ -13,7 +12,7 @@ ci_install_arm_gcc_apt() { ci_install_arm_gcc() { mkdir -p ${TOOLCHAIN_PATH} - wget --no-check-certificate -O - ${TOOLCHAIN_URL} | tar --strip-components=1 -jx -C ${TOOLCHAIN_PATH} + wget --no-check-certificate -O - ${TOOLCHAIN_URL} | tar --strip-components=1 -Jx -C ${TOOLCHAIN_PATH} export PATH=${TOOLCHAIN_PATH}/bin:${PATH} arm-none-eabi-gcc --version }