3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Collect travis build files travis build specific directories 

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2018-06-28 15:03:41 -04:00
parent 640169310f
commit 52ab93be6d
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -10,7 +10,7 @@ addons:
cache: cache:
directories: directories:
- downloads - travis_cache
install: ./scripts/travis-install.sh install: ./scripts/travis-install.sh

10
scripts/travis-build.sh
View File

@ -5,8 +5,10 @@
set -eux set -eux
# Paths to tools installed by travis-install.sh # Paths to tools installed by travis-install.sh
export PATH=${PWD}/gcc-arm-none-eabi-7-2017-q4-major/bin:${PATH} MAIN_DIR=${PWD}
PYTHON=${PWD}/python-env/bin/python BUILD_DIR=${PWD}/travis_build
export PATH=${BUILD_DIR}/gcc-arm-none-eabi-7-2017-q4-major/bin:${PATH}
PYTHON=${BUILD_DIR}/python-env/bin/python
###################################################################### ######################################################################
@ -28,7 +30,7 @@ echo "travis_fold:end:check_whitespace"
# Run compile tests for several different MCU types # Run compile tests for several different MCU types
###################################################################### ######################################################################
DICTDIR=${PWD}/dict DICTDIR=${BUILD_DIR}/dict
mkdir -p ${DICTDIR} mkdir -p ${DICTDIR}
for TARGET in test/configs/*.config ; do for TARGET in test/configs/*.config ; do
@ -49,7 +51,7 @@ done
# Verify klippy host software # Verify klippy host software
###################################################################### ######################################################################
HOSTDIR=${PWD}/hosttest HOSTDIR=${BUILD_DIR}/hosttest
mkdir -p ${HOSTDIR} mkdir -p ${HOSTDIR}
echo "travis_fold:start:klippy" echo "travis_fold:start:klippy"

14
scripts/travis-install.sh
View File

@ -5,7 +5,10 @@
# Stop script early on any error; check variables; be verbose # Stop script early on any error; check variables; be verbose
set -eux set -eux
DOWNLOAD_DIR=${PWD}/downloads MAIN_DIR=${PWD}
BUILD_DIR=${PWD}/travis_build
DOWNLOAD_DIR=${PWD}/travis_cache
mkdir -p ${BUILD_DIR} ${DOWNLOAD_DIR}
###################################################################### ######################################################################
@ -17,9 +20,7 @@ GCC_ARM_URL="https://developer.arm.com/-/media/Files/downloads/gnu-rm/7-2017q4/g
GCC_ARM_SHA="96a029e2ae130a1210eaa69e309ea40463028eab18ba19c1086e4c2dafe69a6a 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})" GCC_ARM_FILE="$(basename ${GCC_ARM_URL})"
mkdir -p ${DOWNLOAD_DIR}
cd ${DOWNLOAD_DIR} cd ${DOWNLOAD_DIR}
if [ ! -f ${GCC_ARM_FILE} ]; then if [ ! -f ${GCC_ARM_FILE} ]; then
wget "$GCC_ARM_URL" wget "$GCC_ARM_URL"
fi fi
@ -28,7 +29,7 @@ if [ "$FOUND_SHA" != "$GCC_ARM_SHA" ]; then
echo "ERROR: Mismatch on gcc arm sha256" echo "ERROR: Mismatch on gcc arm sha256"
exit -1 exit -1
fi fi
cd .. cd ${BUILD_DIR}
tar xf "${DOWNLOAD_DIR}/${GCC_ARM_FILE}" tar xf "${DOWNLOAD_DIR}/${GCC_ARM_FILE}"
@ -37,5 +38,6 @@ tar xf "${DOWNLOAD_DIR}/${GCC_ARM_FILE}"
###################################################################### ######################################################################
echo "=============== Install python virtualenv" echo "=============== Install python virtualenv"
virtualenv python-env cd ${MAIN_DIR}
./python-env/bin/pip install cffi==1.6.0 pyserial==3.2.1 greenlet==0.4.10 virtualenv ${BUILD_DIR}/python-env
${BUILD_DIR}/python-env/bin/pip install cffi==1.6.0 pyserial==3.2.1 greenlet==0.4.10