diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2020-10-30 14:59:57 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2020-10-30 15:30:44 -0400 |
| commit | 33a2d48888e685fb832ea9e3e30b2df218ab424b (patch) | |
| tree | feb1e583d9ae4babf6ee28f1bc7585c2d297cfe7 | |
| parent | 7ad36a21644a1eadfc449a56f4756b9c1fa56f88 (diff) | |
| download | kutter-33a2d48888e685fb832ea9e3e30b2df218ab424b.tar.gz kutter-33a2d48888e685fb832ea9e3e30b2df218ab424b.tar.xz kutter-33a2d48888e685fb832ea9e3e30b2df218ab424b.zip | |
build-test: Build with normal Ubuntu arm-eabi compiler
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
| -rw-r--r-- | .github/workflows/build-test.yaml | 2 | ||||
| -rwxr-xr-x | scripts/travis-build.sh | 1 | ||||
| -rwxr-xr-x | scripts/travis-install.sh | 22 |
3 files changed, 1 insertions, 24 deletions
diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml index 916741c9..be4d74c4 100644 --- a/.github/workflows/build-test.yaml +++ b/.github/workflows/build-test.yaml @@ -9,7 +9,7 @@ jobs: - uses: actions/checkout@v2 - name: Install system dependencies - run: sudo apt-get install gcc-avr avr-libc pv libmpfr-dev libgmp-dev libmpc-dev texinfo libncurses5-dev bison flex python-virtualenv virtualenv python-dev libffi-dev build-essential + run: sudo apt-get install gcc-avr avr-libc pv libmpfr-dev libgmp-dev libmpc-dev texinfo libncurses5-dev bison flex python-virtualenv virtualenv python-dev libffi-dev build-essential libnewlib-arm-none-eabi gcc-arm-none-eabi binutils-arm-none-eabi - name: Setup cache uses: actions/cache@v2 diff --git a/scripts/travis-build.sh b/scripts/travis-build.sh index 19877bf6..913a2aa0 100755 --- a/scripts/travis-build.sh +++ b/scripts/travis-build.sh @@ -7,7 +7,6 @@ set -eu # Paths to tools installed by travis-install.sh MAIN_DIR=${PWD} BUILD_DIR=${PWD}/travis_build -export PATH=${BUILD_DIR}/gcc-arm-none-eabi-7-2017-q4-major/bin:${PATH} export PATH=${BUILD_DIR}/pru-gcc/bin:${PATH} PYTHON=${BUILD_DIR}/python-env/bin/python diff --git a/scripts/travis-install.sh b/scripts/travis-install.sh index d0f42c41..0bb1ff6d 100755 --- a/scripts/travis-install.sh +++ b/scripts/travis-install.sh @@ -12,28 +12,6 @@ mkdir -p ${BUILD_DIR} ${CACHE_DIR} ###################################################################### -# Install embedded arm gcc -###################################################################### - -echo -e "\n\n=============== Install embedded arm gcc\n\n" -GCC_ARM_URL="https://developer.arm.com/-/media/Files/downloads/gnu-rm/7-2017q4/gcc-arm-none-eabi-7-2017-q4-major-linux.tar.bz2" -GCC_ARM_SHA="96a029e2ae130a1210eaa69e309ea40463028eab18ba19c1086e4c2dafe69a6a gcc-arm-none-eabi-7-2017-q4-major-linux.tar.bz2" -GCC_ARM_FILE="$(basename ${GCC_ARM_URL})" - -cd ${CACHE_DIR} -if [ ! -f ${GCC_ARM_FILE} ]; then - wget "$GCC_ARM_URL" -fi -FOUND_SHA=`sha256sum "$GCC_ARM_FILE"` -if [ "$FOUND_SHA" != "$GCC_ARM_SHA" ]; then - echo "ERROR: Mismatch on gcc arm sha256" - exit -1 -fi -cd ${BUILD_DIR} -tar xf "${CACHE_DIR}/${GCC_ARM_FILE}" - - -###################################################################### # Install (or build) pru gcc ###################################################################### |