Skip to content

Commit 6719ac5

Browse files
committed
Revert "Revert "update to GCC 10""
This reverts commit 45e4264. Build issues have been resolved.
1 parent 2219d72 commit 6719ac5

File tree

4 files changed

+27
-27
lines changed

4 files changed

+27
-27
lines changed

.github/workflows/build.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -157,14 +157,14 @@ jobs:
157157
id: check-cache
158158
uses: actions/cache@v2
159159
with:
160-
path: ${{ runner.tool_cache }}/gcc-arm-9-2020-q2
161-
key: gcc-arm-9-2020-q2
160+
path: ${{ runner.tool_cache }}/gcc-arm-10-2020-q4
161+
key: gcc-arm-10-2020-q4
162162
- name: Download
163163
if: steps.check-cache.outputs.cache-hit != 'true'
164-
uses: fiam/arm-none-eabi-gcc@v1.0.3
164+
uses: dlech/arm-none-eabi-gcc@master
165165
with:
166-
release: '9-2020-q2'
167-
directory: ${{ runner.tool_cache }}/gcc-arm-9-2020-q2
166+
release: '10-2020-q4'
167+
directory: ${{ runner.tool_cache }}/gcc-arm-10-2020-q4
168168

169169
firmware:
170170
name: firmware
@@ -178,10 +178,10 @@ jobs:
178178
- name: Install cross-compiler
179179
uses: actions/cache@v2
180180
with:
181-
path: ${{ runner.tool_cache }}/gcc-arm-9-2020-q2
182-
key: gcc-arm-9-2020-q2
181+
path: ${{ runner.tool_cache }}/gcc-arm-10-2020-q4
182+
key: gcc-arm-10-2020-q4
183183
- name: Add cross-compiler to path
184-
run: echo ${{ runner.tool_cache }}/gcc-arm-9-2020-q2/bin >> $GITHUB_PATH
184+
run: echo ${{ runner.tool_cache }}/gcc-arm-10-2020-q4/bin >> $GITHUB_PATH
185185
- name: Checkout repo
186186
uses: actions/checkout@v2
187187
with:
@@ -241,10 +241,10 @@ jobs:
241241
- name: Install cross-compiler
242242
uses: actions/cache@v2
243243
with:
244-
path: ${{ runner.tool_cache }}/gcc-arm-9-2020-q2
245-
key: gcc-arm-9-2020-q2
244+
path: ${{ runner.tool_cache }}/gcc-arm-10-2020-q4
245+
key: gcc-arm-10-2020-q4
246246
- name: Add cross-compiler to path
247-
run: echo ${{ runner.tool_cache }}/gcc-arm-9-2020-q2/bin >> $GITHUB_PATH
247+
run: echo ${{ runner.tool_cache }}/gcc-arm-10-2020-q4/bin >> $GITHUB_PATH
248248
- name: Checkout repo
249249
uses: actions/checkout@v2
250250
with:

.github/workflows/release.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ jobs:
1717
id: check-cache
1818
uses: actions/cache@v2
1919
with:
20-
path: ${{ runner.tool_cache }}/gcc-arm-9-2020-q2
21-
key: gcc-arm-9-2020-q2
20+
path: ${{ runner.tool_cache }}/gcc-arm-10-2020-q4
21+
key: gcc-arm-10-2020-q4
2222
- name: Download
2323
if: steps.check-cache.outputs.cache-hit != 'true'
24-
uses: fiam/arm-none-eabi-gcc@v1.0.3
24+
uses: dlech/arm-none-eabi-gcc@master
2525
with:
26-
release: '9-2020-q2'
27-
directory: ${{ runner.tool_cache }}/gcc-arm-9-2020-q2
26+
release: '10-2020-q4'
27+
directory: ${{ runner.tool_cache }}/gcc-arm-10-2020-q4
2828
- name: Add cross-compiler to path
29-
run: echo ${{ runner.tool_cache }}/gcc-arm-9-2020-q2/bin >> $GITHUB_PATH
29+
run: echo ${{ runner.tool_cache }}/gcc-arm-10-2020-q4/bin >> $GITHUB_PATH
3030
- name: Checkout code
3131
uses: actions/checkout@v2
3232
with:

.vscode/c_cpp_properties.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
//
88
// Note: to correctly find the cross compiler if it isn't in $PATH, add:
99
//
10-
// export GCC_9_ARM_NONE_EABI_BIN=/path/to/gcc-9-arm-none-eabi/bin/
10+
// export GCC_10_ARM_NONE_EABI_BIN=/path/to/gcc-10-arm-none-eabi/bin/
1111
//
1212
// in .bashrc or .zshrc (trailing slash is required), then restart VS Code.
1313

1414
{
1515
"env": {
16-
"gcc9ArmNoneEabi": "${env:GCC_9_ARM_NONE_EABI_BIN}arm-none-eabi-gcc"
16+
"gcc10ArmNoneEabi": "${env:GCC_10_ARM_NONE_EABI_BIN}arm-none-eabi-gcc"
1717
},
1818
"configurations": [
1919
{
@@ -41,7 +41,7 @@
4141
"USE_FULL_LL_DRIVER",
4242
"FIXMATH_NO_CTYPE"
4343
],
44-
"compilerPath": "${gcc9ArmNoneEabi}",
44+
"compilerPath": "${gcc10ArmNoneEabi}",
4545
"compilerArgs": [
4646
"-Wall",
4747
"-Werror",
@@ -81,7 +81,7 @@
8181
"USE_FULL_LL_DRIVER",
8282
"FIXMATH_NO_CTYPE"
8383
],
84-
"compilerPath": "${gcc9ArmNoneEabi}",
84+
"compilerPath": "${gcc10ArmNoneEabi}",
8585
"compilerArgs": [
8686
"-Wall",
8787
"-Werror",
@@ -125,7 +125,7 @@
125125
"USE_FULL_LL_DRIVER",
126126
"FIXMATH_NO_CTYPE"
127127
],
128-
"compilerPath": "${gcc9ArmNoneEabi}",
128+
"compilerPath": "${gcc10ArmNoneEabi}",
129129
"compilerArgs": [
130130
"-Wall",
131131
"-Werror",
@@ -173,7 +173,7 @@
173173
"USE_FULL_LL_DRIVER",
174174
"FIXMATH_NO_CTYPE"
175175
],
176-
"compilerPath": "${gcc9ArmNoneEabi}",
176+
"compilerPath": "${gcc10ArmNoneEabi}",
177177
"compilerArgs": [
178178
"-Wall",
179179
"-Werror",
@@ -209,7 +209,7 @@
209209
"MICROPY_ROM_TEXT_COMPRESSION",
210210
"FIXMATH_NO_CTYPE"
211211
],
212-
"compilerPath": "${gcc9ArmNoneEabi}",
212+
"compilerPath": "${gcc10ArmNoneEabi}",
213213
"compilerArgs": [
214214
"-mthumb",
215215
"-mtune=arm7tdmi",
@@ -242,7 +242,7 @@
242242
"STM32_HAL_H=<stm32f4xx_hal.h>",
243243
"FIXMATH_NO_CTYPE"
244244
],
245-
"compilerPath": "${gcc9ArmNoneEabi}",
245+
"compilerPath": "${gcc10ArmNoneEabi}",
246246
"compilerArgs": [
247247
"-Wall",
248248
"-Werror",

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ This is the recommended development environment used by the Pybricks maintainers
1212
- [Python][python] v3.8.x
1313
- [Poetry][poetry] v1.x
1414
- [Uncrustify][uncrustify] v0.71.x
15-
- [GNU ARM Embedded Toolchain][arm-gcc] v9-2020-q2
15+
- [GNU ARM Embedded Toolchain][arm-gcc] v10-2020-q4
1616
- [GNU GCC][gcc] for host operating system
1717
- [GNU Make][make]
1818

@@ -91,7 +91,7 @@ Cygwin and the [GNU ARM Embedded Toolchain][arm-gcc] need to be added to the
9191
rather than globally via *System Properties*. For example using PowerShell:
9292

9393
```powershell
94-
$env:PATH="C:\cygwin64\bin;C:\Program Files (x86)\GNU Arm Embedded Toolchain\9 2020-q2-update\bin;$env:PATH"
94+
$env:PATH="C:\cygwin64\bin;C:\Program Files (x86)\GNU Arm Embedded Toolchain\10 2020-q4-major\bin;$env:PATH"
9595
```
9696

9797
[cygwin]: https://www.cygwin.com/

0 commit comments

Comments
 (0)