mirrors
/
pimoroni-pico
mirror of https://github.com/pimoroni/pimoroni-pico.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #458 from pimoroni/patch-revert-wget-arm-gcc 

CI: Revert: wget ARM GCC toolchain
This commit is contained in:
Philip Howard 2022-07-22 14:52:43 +01:00 committed by GitHub
parent 0f826782c6 5403947084
commit 52e875d39f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.github/workflows/cmake.yml vendored
View File

@ -18,7 +18,7 @@ jobs:
name: Linux name: Linux
cache-key: linux cache-key: linux
cmake-args: '-DPICO_SDK_PATH=$GITHUB_WORKSPACE/pico-sdk -DPICO_SDK_POST_LIST_DIRS=$GITHUB_WORKSPACE/pico-extras' cmake-args: '-DPICO_SDK_PATH=$GITHUB_WORKSPACE/pico-sdk -DPICO_SDK_POST_LIST_DIRS=$GITHUB_WORKSPACE/pico-extras'
apt-packages: ccache apt-packages: ccache gcc-arm-none-eabi
runs-on: ${{matrix.os}} runs-on: ${{matrix.os}}
@ -61,22 +61,13 @@ jobs:
run: | run: |
sudo apt update && sudo apt install ${{matrix.apt-packages}} 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 - name: Create Build Environment
run: cmake -E make_directory ${{runner.workspace}}/build run: cmake -E make_directory ${{runner.workspace}}/build
- name: Configure CMake - name: Configure CMake
shell: bash shell: bash
working-directory: ${{runner.workspace}}/build 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 - name: Build
working-directory: ${{runner.workspace}}/build working-directory: ${{runner.workspace}}/build

11
.github/workflows/micropython-badger2040.yml vendored
View File

@ -92,18 +92,9 @@ jobs:
- name: Install Compiler & CCache - name: Install Compiler & CCache
if: runner.os == 'Linux' if: runner.os == 'Linux'
run: | run: |
sudo apt update && sudo apt install ccache sudo apt update && sudo apt install ccache gcc-arm-none-eabi
python3 -m pip install pillow 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 - name: Configure MicroPython
shell: bash shell: bash
working-directory: micropython/ports/rp2 working-directory: micropython/ports/rp2

11
.github/workflows/micropython.yml vendored
View File

@ -94,16 +94,7 @@ jobs:
- name: Install Compiler & CCache - name: Install Compiler & CCache
if: runner.os == 'Linux' if: runner.os == 'Linux'
run: | run: |
sudo apt update && sudo apt install ccache sudo apt update && sudo apt install ccache gcc-arm-none-eabi
- 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 - uses: actions/checkout@v2
with: with: