From b7061b9dd70ce32d9404669626d77272d2265e3b Mon Sep 17 00:00:00 2001 From: Phil Howard Date: Fri, 11 Mar 2022 10:48:36 +0000 Subject: [PATCH] CI: EXPERIMENTAL: wget ARM GCC toolchain --- .github/workflows/cmake.yml | 13 +++++++++++-- .github/workflows/micropython-badger2040.yml | 11 ++++++++++- .github/workflows/micropython-with-blinka.yml | 11 ++++++++++- .github/workflows/micropython.yml | 11 ++++++++++- 4 files changed, 41 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 4f6af635..412b1f83 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -18,7 +18,7 @@ jobs: name: Linux cache-key: linux cmake-args: '-DPICO_SDK_PATH=$GITHUB_WORKSPACE/pico-sdk -DPICO_SDK_POST_LIST_DIRS=$GITHUB_WORKSPACE/pico-extras' - apt-packages: ccache gcc-arm-none-eabi + apt-packages: ccache runs-on: ${{matrix.os}} @@ -61,13 +61,22 @@ jobs: run: | sudo apt update && sudo apt install ${{matrix.apt-packages}} + - name: Install ARM Toolchain + if: runner.os == 'Linux' + working-directory: ${{runner.workspace}} + run: | + wget -q https://developer.arm.com/-/media/Files/downloads/gnu-rm/10.3-2021.10/gcc-arm-none-eabi-10.3-2021.10-x86_64-linux.tar.bz2 + tar xf gcc-*.tar.bz2 + cd gcc*/bin + pwd >> $GITHUB_PATH + - name: Create Build Environment run: cmake -E make_directory ${{runner.workspace}}/build - name: Configure CMake shell: bash working-directory: ${{runner.workspace}}/build - run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ${{matrix.cmake-args}} + run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ${{matrix.cmake-args}} - name: Build working-directory: ${{runner.workspace}}/build diff --git a/.github/workflows/micropython-badger2040.yml b/.github/workflows/micropython-badger2040.yml index ad9186e6..ff469c40 100644 --- a/.github/workflows/micropython-badger2040.yml +++ b/.github/workflows/micropython-badger2040.yml @@ -92,9 +92,18 @@ jobs: - name: Install Compiler & CCache if: runner.os == 'Linux' run: | - sudo apt update && sudo apt install ccache gcc-arm-none-eabi + sudo apt update && sudo apt install ccache python3 -m pip install pillow + - name: Install ARM Toolchain + if: runner.os == 'Linux' + working-directory: ${{runner.workspace}} + run: | + wget -q https://developer.arm.com/-/media/Files/downloads/gnu-rm/10.3-2021.10/gcc-arm-none-eabi-10.3-2021.10-x86_64-linux.tar.bz2 + tar xf gcc-*.tar.bz2 + cd gcc*/bin + pwd >> $GITHUB_PATH + - name: Configure MicroPython shell: bash working-directory: micropython/ports/rp2 diff --git a/.github/workflows/micropython-with-blinka.yml b/.github/workflows/micropython-with-blinka.yml index 1a74049f..0250061e 100644 --- a/.github/workflows/micropython-with-blinka.yml +++ b/.github/workflows/micropython-with-blinka.yml @@ -24,7 +24,7 @@ jobs: name: Linux cache-key: linux cmake-args: '-DPICO_SDK_PATH=$GITHUB_WORKSPACE/pico-sdk' - apt-packages: clang-tidy gcc-arm-none-eabi libnewlib-arm-none-eabi libstdc++-arm-none-eabi-newlib + apt-packages: ccache runs-on: ${{matrix.os}} @@ -82,6 +82,15 @@ jobs: run: | sudo apt update && sudo apt install ${{matrix.apt-packages}} + - name: Install ARM Toolchain + if: runner.os == 'Linux' + working-directory: ${{runner.workspace}} + run: | + wget -q https://developer.arm.com/-/media/Files/downloads/gnu-rm/10.3-2021.10/gcc-arm-none-eabi-10.3-2021.10-x86_64-linux.tar.bz2 + tar xf gcc-*.tar.bz2 + cd gcc*/bin + pwd >> $GITHUB_PATH + - name: Fetch base MicroPython submodules shell: bash working-directory: micropython diff --git a/.github/workflows/micropython.yml b/.github/workflows/micropython.yml index c94c05ba..949347b6 100644 --- a/.github/workflows/micropython.yml +++ b/.github/workflows/micropython.yml @@ -92,7 +92,16 @@ jobs: - name: Install Compiler & CCache if: runner.os == 'Linux' run: | - sudo apt update && sudo apt install ccache gcc-arm-none-eabi + sudo apt update && sudo apt install ccache + + - name: Install ARM Toolchain + if: runner.os == 'Linux' + working-directory: ${{runner.workspace}} + run: | + wget -q https://developer.arm.com/-/media/Files/downloads/gnu-rm/10.3-2021.10/gcc-arm-none-eabi-10.3-2021.10-x86_64-linux.tar.bz2 + tar xf gcc-*.tar.bz2 + cd gcc*/bin + pwd >> $GITHUB_PATH - uses: actions/checkout@v2 with: