From dd2aeddd1304fc36535ba48fc99b88afd46dcf32 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Thu, 28 Dec 2023 16:47:52 -0500 Subject: [PATCH] github LFS is broken or some sort of quota? --- .github/workflows/build-firmware.yaml | 13 +++++-------- .github/workflows/codeql-buildscript.sh | 6 ------ .github/workflows/codeql.yml | 9 +++++++++ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build-firmware.yaml b/.github/workflows/build-firmware.yaml index c3e5345520..e2fbe8cc6d 100644 --- a/.github/workflows/build-firmware.yaml +++ b/.github/workflows/build-firmware.yaml @@ -544,17 +544,14 @@ jobs: bash gen_config_board.sh ${{matrix.folder}} ${{matrix.short-board-name}} fi - # Build machines don't have arm-none-eabi gcc, so let's download it and put it on the path - - name: Download & Install GCC + - name: Install Arm GNU Toolchain (arm-none-eabi-gcc) if: ${{ env.skip != 'true' }} - env: - ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true' - run: | - ./firmware/provide_gcc.sh - echo "`pwd`/gcc-arm-none-eabi/bin" >> $GITHUB_PATH + uses: carlosperate/arm-none-eabi-gcc-action@v1 + with: + release: '12.2.Rel1' # Make sure the compiler we just downloaded works - just print out the version - - name: Test Compiler + - name: Test arm-none-eabi-gcc Compiler if: ${{ env.skip != 'true' }} run: arm-none-eabi-gcc -v diff --git a/.github/workflows/codeql-buildscript.sh b/.github/workflows/codeql-buildscript.sh index 53af090399..814e5c6711 100644 --- a/.github/workflows/codeql-buildscript.sh +++ b/.github/workflows/codeql-buildscript.sh @@ -14,11 +14,5 @@ mkdir ~/.rusefi-tools dir=$(realpath firmware) cd ~/.rusefi-tools -# provide GCC arm-none-eabi toolchain -${dir}/provide_gcc.sh - -# Add the compiler to your path -export PATH=$HOME/.rusefi-tools/gcc-arm-none-eabi/bin:$PATH - cd ${dir} make -j$(nproc) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 4be09587e5..7b604c3221 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -67,6 +67,15 @@ jobs: working-directory: ./firmware/ run: ./gen_default_everything.sh + - name: Install Arm GNU Toolchain (arm-none-eabi-gcc) + uses: carlosperate/arm-none-eabi-gcc-action@v1 + with: + release: '12.2.Rel1' + + # Make sure the compiler we just downloaded works - just print out the version + - name: Test arm-none-eabi-gcc Compiler + run: arm-none-eabi-gcc -v + # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL uses: github/codeql-action/init@v3