From 6719ac570f8c4e9b9d55881a38c0247812a9cb45 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Thu, 7 Jan 2021 10:42:02 -0600 Subject: [PATCH] Revert "Revert "update to GCC 10"" This reverts commit 45e4264386f189a2d0db7e09b0360ca28628e82e. Build issues have been resolved. --- .github/workflows/build.yml | 22 +++++++++++----------- .github/workflows/release.yml | 12 ++++++------ .vscode/c_cpp_properties.json | 16 ++++++++-------- CONTRIBUTING.md | 4 ++-- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f7f18c3bb..3b2c4cd45 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -157,14 +157,14 @@ jobs: id: check-cache uses: actions/cache@v2 with: - path: ${{ runner.tool_cache }}/gcc-arm-9-2020-q2 - key: gcc-arm-9-2020-q2 + path: ${{ runner.tool_cache }}/gcc-arm-10-2020-q4 + key: gcc-arm-10-2020-q4 - name: Download if: steps.check-cache.outputs.cache-hit != 'true' - uses: fiam/arm-none-eabi-gcc@v1.0.3 + uses: dlech/arm-none-eabi-gcc@master with: - release: '9-2020-q2' - directory: ${{ runner.tool_cache }}/gcc-arm-9-2020-q2 + release: '10-2020-q4' + directory: ${{ runner.tool_cache }}/gcc-arm-10-2020-q4 firmware: name: firmware @@ -178,10 +178,10 @@ jobs: - name: Install cross-compiler uses: actions/cache@v2 with: - path: ${{ runner.tool_cache }}/gcc-arm-9-2020-q2 - key: gcc-arm-9-2020-q2 + path: ${{ runner.tool_cache }}/gcc-arm-10-2020-q4 + key: gcc-arm-10-2020-q4 - name: Add cross-compiler to path - run: echo ${{ runner.tool_cache }}/gcc-arm-9-2020-q2/bin >> $GITHUB_PATH + run: echo ${{ runner.tool_cache }}/gcc-arm-10-2020-q4/bin >> $GITHUB_PATH - name: Checkout repo uses: actions/checkout@v2 with: @@ -241,10 +241,10 @@ jobs: - name: Install cross-compiler uses: actions/cache@v2 with: - path: ${{ runner.tool_cache }}/gcc-arm-9-2020-q2 - key: gcc-arm-9-2020-q2 + path: ${{ runner.tool_cache }}/gcc-arm-10-2020-q4 + key: gcc-arm-10-2020-q4 - name: Add cross-compiler to path - run: echo ${{ runner.tool_cache }}/gcc-arm-9-2020-q2/bin >> $GITHUB_PATH + run: echo ${{ runner.tool_cache }}/gcc-arm-10-2020-q4/bin >> $GITHUB_PATH - name: Checkout repo uses: actions/checkout@v2 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 624d13574..b1f6d0302 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,16 +17,16 @@ jobs: id: check-cache uses: actions/cache@v2 with: - path: ${{ runner.tool_cache }}/gcc-arm-9-2020-q2 - key: gcc-arm-9-2020-q2 + path: ${{ runner.tool_cache }}/gcc-arm-10-2020-q4 + key: gcc-arm-10-2020-q4 - name: Download if: steps.check-cache.outputs.cache-hit != 'true' - uses: fiam/arm-none-eabi-gcc@v1.0.3 + uses: dlech/arm-none-eabi-gcc@master with: - release: '9-2020-q2' - directory: ${{ runner.tool_cache }}/gcc-arm-9-2020-q2 + release: '10-2020-q4' + directory: ${{ runner.tool_cache }}/gcc-arm-10-2020-q4 - name: Add cross-compiler to path - run: echo ${{ runner.tool_cache }}/gcc-arm-9-2020-q2/bin >> $GITHUB_PATH + run: echo ${{ runner.tool_cache }}/gcc-arm-10-2020-q4/bin >> $GITHUB_PATH - name: Checkout code uses: actions/checkout@v2 with: diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index 6855f8267..6571bb2d4 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -7,13 +7,13 @@ // // Note: to correctly find the cross compiler if it isn't in $PATH, add: // -// export GCC_9_ARM_NONE_EABI_BIN=/path/to/gcc-9-arm-none-eabi/bin/ +// export GCC_10_ARM_NONE_EABI_BIN=/path/to/gcc-10-arm-none-eabi/bin/ // // in .bashrc or .zshrc (trailing slash is required), then restart VS Code. { "env": { - "gcc9ArmNoneEabi": "${env:GCC_9_ARM_NONE_EABI_BIN}arm-none-eabi-gcc" + "gcc10ArmNoneEabi": "${env:GCC_10_ARM_NONE_EABI_BIN}arm-none-eabi-gcc" }, "configurations": [ { @@ -41,7 +41,7 @@ "USE_FULL_LL_DRIVER", "FIXMATH_NO_CTYPE" ], - "compilerPath": "${gcc9ArmNoneEabi}", + "compilerPath": "${gcc10ArmNoneEabi}", "compilerArgs": [ "-Wall", "-Werror", @@ -81,7 +81,7 @@ "USE_FULL_LL_DRIVER", "FIXMATH_NO_CTYPE" ], - "compilerPath": "${gcc9ArmNoneEabi}", + "compilerPath": "${gcc10ArmNoneEabi}", "compilerArgs": [ "-Wall", "-Werror", @@ -125,7 +125,7 @@ "USE_FULL_LL_DRIVER", "FIXMATH_NO_CTYPE" ], - "compilerPath": "${gcc9ArmNoneEabi}", + "compilerPath": "${gcc10ArmNoneEabi}", "compilerArgs": [ "-Wall", "-Werror", @@ -173,7 +173,7 @@ "USE_FULL_LL_DRIVER", "FIXMATH_NO_CTYPE" ], - "compilerPath": "${gcc9ArmNoneEabi}", + "compilerPath": "${gcc10ArmNoneEabi}", "compilerArgs": [ "-Wall", "-Werror", @@ -209,7 +209,7 @@ "MICROPY_ROM_TEXT_COMPRESSION", "FIXMATH_NO_CTYPE" ], - "compilerPath": "${gcc9ArmNoneEabi}", + "compilerPath": "${gcc10ArmNoneEabi}", "compilerArgs": [ "-mthumb", "-mtune=arm7tdmi", @@ -242,7 +242,7 @@ "STM32_HAL_H=", "FIXMATH_NO_CTYPE" ], - "compilerPath": "${gcc9ArmNoneEabi}", + "compilerPath": "${gcc10ArmNoneEabi}", "compilerArgs": [ "-Wall", "-Werror", diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4613789cb..bc5f78f3b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -12,7 +12,7 @@ This is the recommended development environment used by the Pybricks maintainers - [Python][python] v3.8.x - [Poetry][poetry] v1.x - [Uncrustify][uncrustify] v0.71.x -- [GNU ARM Embedded Toolchain][arm-gcc] v9-2020-q2 +- [GNU ARM Embedded Toolchain][arm-gcc] v10-2020-q4 - [GNU GCC][gcc] for host operating system - [GNU Make][make] @@ -91,7 +91,7 @@ Cygwin and the [GNU ARM Embedded Toolchain][arm-gcc] need to be added to the rather than globally via *System Properties*. For example using PowerShell: ```powershell -$env:PATH="C:\cygwin64\bin;C:\Program Files (x86)\GNU Arm Embedded Toolchain\9 2020-q2-update\bin;$env:PATH" +$env:PATH="C:\cygwin64\bin;C:\Program Files (x86)\GNU Arm Embedded Toolchain\10 2020-q4-major\bin;$env:PATH" ``` [cygwin]: https://www.cygwin.com/