Skip to content

Commit 6d6c662

Browse files
Updated toolchain to 11.2
1 parent 76166ea commit 6d6c662

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.github/workflows/build.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,21 +69,21 @@ jobs:
6969
id: cache-gcc-toolchain
7070
uses: actions/cache@v2
7171
with:
72-
path: ${{ github.workspace }}/gcc_toolchain_10_3
73-
key: ${{runner.os}}-toolchain-v10_3
72+
path: ${{ github.workspace }}/gcc_toolchain_11_2
73+
key: ${{runner.os}}-toolchain-v11_2
7474

7575
- name: Get the latest arm-gcc-none-eabi-gcc
7676
uses: wei/wget@v1
7777
if: steps.cache-gcc-toolchain.outputs.cache-hit != 'true'
7878
id: download-arm-gcc
7979
with:
80-
args: "https://developer.arm.com/-/media/Files/downloads/gnu-rm/10.3-2021.07/gcc-arm-none-eabi-10.3-2021.07-x86_64-linux.tar.bz2"
80+
args: "https://developer.arm.com/-/media/Files/downloads/gnu/11.2-2022.02/binrel/gcc-arm-11.2-2022.02-x86_64-arm-none-eabi.tar.xz"
8181

8282
- name: Unpack arm-gcc-compiler
8383
if: steps.cache-gcc-toolchain.outputs.cache-hit != 'true'
8484
run: |
85-
mkdir gcc_toolchain_10_3
86-
tar -xjf gcc-arm-none-eabi-10.3-2021.07-x86_64-linux.tar.bz2 --directory ${{ github.workspace }}/gcc_toolchain_10_3
85+
mkdir gcc_toolchain_11_2
86+
tar -xJf gcc-arm-11.2-2022.02-x86_64-arm-none-eabi.tar.xz --directory ${{ github.workspace }}/gcc_toolchain_11_2
8787
8888
- name: Cache NordicSDK
8989
id: cache-nordic-sdk
@@ -113,7 +113,7 @@ jobs:
113113
cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
114114
cmakeListsTxtPath: ${{ github.workspace }}/Firmware/CMakeLists.txt
115115
cmakeBuildType: Debug
116-
cmakeAppendedArgs: '-DTARGET_PLATFORM:STRING="ARM_CORTEX" -DEXECUTE_MCU_FLASHING=OFF -DCMAKE_BUILD_TYPE:STRING=Debug -DREDUCE_LVGL_BINARY_SIZE=ON -DPACKAGE_TESTS=OFF -DNRF5_SDK_PATH=${{ github.workspace }}/Nrf52SDKv16_0 -DARM_NONE_EABI_TOOLCHAIN_PATH:PATH=${{ github.workspace }}/gcc_toolchain_10_3/gcc-arm-none-eabi-10.3-2021.07'
116+
cmakeAppendedArgs: '-DTARGET_PLATFORM:STRING="ARM_CORTEX" -DEXECUTE_MCU_FLASHING=OFF -DCMAKE_BUILD_TYPE:STRING=Debug -DREDUCE_LVGL_BINARY_SIZE=ON -DPACKAGE_TESTS=OFF -DNRF5_SDK_PATH=${{ github.workspace }}/Nrf52SDKv16_0 -DARM_NONE_EABI_TOOLCHAIN_PATH:PATH=${{ github.workspace }}/gcc_toolchain_11_2/gcc-arm-11.2-2022.02-x86_64-arm-none-eabi'
117117
buildWithCMake: true
118118

119119
# # Runs a set of commands using the runners shell

Firmware/cmake/base.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
if( NOT ARM_NONE_EABI_TOOLCHAIN_PATH )
22
#set(ARM_NONE_EABI_TOOLCHAIN_PATH "C:/gcc_none_eabi_9_2_1")
3-
set(ARM_NONE_EABI_TOOLCHAIN_PATH "C:/gcc_arm_none_eabi_10_3")
3+
set(ARM_NONE_EABI_TOOLCHAIN_PATH "C:/gcc_arm_none_eabi_11_2")
44
message(STATUS "No ARM_NONE_EABI_TOOLCHAIN_PATH specified, using default: " ${ARM_NONE_EABI_TOOLCHAIN_PATH})
55
else()
66
message(STATUS " ARM_NONE_EABI_TOOLCHAIN_PATH specified using: " ${ARM_NONE_EABI_TOOLCHAIN_PATH})

0 commit comments

Comments
 (0)