diff options
| -rw-r--r-- | .github/workflows/main.yml | 6 | ||||
| -rw-r--r-- | docs/install.rst | 2 | ||||
| -rw-r--r-- | tools/docker/Dockerfile | 2 | ||||
| -rw-r--r-- | tools/docker/setup-env.sh | 3 |
4 files changed, 6 insertions, 7 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 35acd9c..1d4ac90 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,11 +29,9 @@ jobs: id: install-toolchain # installs arm-none-eabi if the CI environment can't find it in the cache if: steps.cache-toolchain.outputs.cache-hit != 'true' - # Currently v1.0.2 is the latest version... but it is from July 2020 - # and is currently broken. Use a newer version instead. - uses: fiam/arm-none-eabi-gcc@162d71c10065d706b8a07a2f27d7628cad82e4e3 + uses: fiam/arm-none-eabi-gcc@v1.0.4 with: - release: 9-2019-q4 + release: 10-2020-q4 directory: ${{ runner.temp }}/arm-none-eabi - name: Install packages diff --git a/docs/install.rst b/docs/install.rst index 8261259..f194e19 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -45,7 +45,7 @@ with pip instead: You will also need a toolchain for the Arm Cortex-M4. wasp-os is developed and tested using the `GNU-RM toolchain <https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm>`_ -(9-2019-q4) from Arm. +(10-2020-q4) from Arm. .. note:: diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 96798f2..6f1bead 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -15,7 +15,7 @@ RUN set -xe; \ pip3 install cbor pysdl2 pygobject cryptography; RUN set -xe; \ - wget --progress=dot:mega -O - https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2019q4/gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2 | tar xjf - -C /opt + wget --progress=dot:mega -O - https://developer.arm.com/-/media/Files/downloads/gnu-rm/10-2020q4/gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2 | tar xjf - -C /opt RUN set -xe; \ addgroup --gid $gid user; \ diff --git a/tools/docker/setup-env.sh b/tools/docker/setup-env.sh index f97b1f3..245fb03 100644 --- a/tools/docker/setup-env.sh +++ b/tools/docker/setup-env.sh @@ -1,3 +1,4 @@ -export PATH=/opt/gcc-arm-none-eabi-9-2019-q4-major/bin:$PATH +export PATH=/opt/gcc-arm-none-eabi-10-2020-q4-major/bin:$PATH + cd ~/wasp-os |