rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use rusEFI pruned ARM GCC 11.3 (#4763) 

* use rusEFI pruned ARM GCC 11.3

* fix Firmware at GHA: avoid dash

* avoid double decompress in provide_gcc.sh

also ensure TMP_DIR, avoiding strange woes about GHA CI: ./firmware/provide_gcc.sh: 23: pushd: not found
This commit is contained in:
Nathan Schulte 2022-11-09 06:18:40 -06:00 committed by GitHub
parent 9ee03080b5
commit 6a53159c0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build-firmware.yaml vendored
View File

@ -319,7 +319,7 @@ jobs:
env: env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true' ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
run: | run: |
sh ./firmware/provide_gcc.sh ./firmware/provide_gcc.sh
echo "::add-path::`pwd`/gcc-arm-none-eabi/bin" echo "::add-path::`pwd`/gcc-arm-none-eabi/bin"
# Make sure the compiler we just downloaded works - just print out the version # Make sure the compiler we just downloaded works - just print out the version
@ -440,7 +440,7 @@ jobs:
env: env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true' ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
run: | run: |
sh ./firmware/provide_gcc.sh ./firmware/provide_gcc.sh
echo "::add-path::`pwd`/gcc-arm-none-eabi/bin" echo "::add-path::`pwd`/gcc-arm-none-eabi/bin"
# Make sure the compiler we just downloaded works - just print out the version # Make sure the compiler we just downloaded works - just print out the version

31
firmware/provide_gcc.sh
View File

@ -4,20 +4,31 @@
set -e set -e
URL="https://github.com/rusefi/build_support/raw/master/arm-gnu-toolchain-11.3.rel1-x86_64-arm-none-eabi.tar.xz" # URL to download original toolchain from
ARCHIVE="${URL##*/}" URL="https://github.com/rusefi/build_support/raw/master/rusefi-arm-gnu-toolchain-11.3.rel1-x86_64-arm-none-eabi.tar.xz"
DIR="gcc-arm-none-eabi" # colloquial directory name, to afford re-use of script
COLLOQUIAL="gcc-arm-none-eabi"
# temporary working directory
TMP_DIR="/tmp/rusefi-provide_gcc"
# Delete existing archive archive="${URL##*/}"
rm -rf ${ARCHIVE}
# Cleanup prior [failed] runs
rm -rf "${TMP_DIR}"
# Download and extract archive # Download and extract archive
curl -L -o ${ARCHIVE} ${URL} echo Downloading and extracting ${archive}
tar -xavf ${ARCHIVE} mkdir -p "${TMP_DIR}"
cd "${TMP_DIR}"
curl -L -o "${archive}" "${URL}"
tar -xaf "${archive}"
rm "${archive}"
# Create colloquially named link # Create colloquially named link
ARCHIVE_DIR=$(tar --exclude="*/*" -tf ${ARCHIVE}) archive_dir="$(echo *)"
ln -s ${ARCHIVE_DIR%/} ${DIR} cd - >/dev/null
mv "${TMP_DIR}/${archive_dir}" "$(pwd)"
ln -s "${archive_dir%/}" "${COLLOQUIAL}"
# Delete downloaded archive # Delete downloaded archive
rm ${ARCHIVE} rm -rf "${TMP_DIR}"