Travis: esptool2 now in its own repository

This commit is contained in:
Angus Gratton 2015-12-30 15:08:31 +11:00
parent bb0f31369f
commit 0ea1b3070e

View file

@ -5,13 +5,13 @@ env:
OPENSDK_COMMIT=cd1d336 OPENSDK_COMMIT=cd1d336
CROSS_ROOT="${HOME}/toolchain-${OPENSDK_COMMIT}" CROSS_ROOT="${HOME}/toolchain-${OPENSDK_COMMIT}"
CROSS_BINDIR="${CROSS_ROOT}/bin" CROSS_BINDIR="${CROSS_ROOT}/bin"
ESPTOOL2_COMMIT=92530bb8 ESPTOOL2_COMMIT=ec0e2c7
ESPTOOL2_BINDIR="${HOME}/esptool2-${ESPTOOL2_COMMIT}" ESPTOOL2_DIR="${HOME}/esptool2-${ESPTOOL2_COMMIT}"
PATH=${PATH}:${CROSS_BINDIR}:${ESPTOOL2_BINDIR} PATH=${PATH}:${CROSS_BINDIR}:${ESPTOOL2_DIR}
cache: cache:
directories: directories:
- ${CROSS_ROOT} - ${CROSS_ROOT}
- ${ESPTOOL2_BINDIR} - ${ESPTOOL2_DIR}
addons: addons:
apt: apt:
packages: packages:
@ -48,11 +48,11 @@ before_install:
- ${HAS_TC} || sed -i "s/2.69/2.68/" lx106-hal/configure.ac # this is a nasty hack as Ubuntu Precise only has autoconf 2.68 not 2.69... - ${HAS_TC} || sed -i "s/2.69/2.68/" lx106-hal/configure.ac # this is a nasty hack as Ubuntu Precise only has autoconf 2.68 not 2.69...
- ${HAS_TC} || sed -r -i 's%TOOLCHAIN ?=.*%TOOLCHAIN=${CROSS_ROOT}%' Makefile - ${HAS_TC} || sed -r -i 's%TOOLCHAIN ?=.*%TOOLCHAIN=${CROSS_ROOT}%' Makefile
- ${HAS_TC} || make STANDALONE=n - ${HAS_TC} || make STANDALONE=n
- export HAS_ET2="test -f ${ESPTOOL2_BINDIR}/esptool2" - export HAS_ET2="test -f ${ESPTOOL2_DIR}/esptool2"
- ${HAS_ET2} || git clone https://github.com/raburton/esp8266 ${HOME}/raburton - ${HAS_ET2} || git clone https://github.com/raburton/esptool2 ${ESPTOOL2_DIR}
- ${HAS_ET2} || make -C ${HOME}/raburton/esptool2 - ${HAS_ET2} || cd ${ESPTOOL2_DIR}
- ${HAS_ET2} || mkdir -p ${ESPTOOL2_BINDIR} - ${HAS_ET2} || git reset --hard ${ESPTOOL2_COMMIT}
- ${HAS_ET2} || cp -a ${HOME}/raburton/esptool2/esptool2 ${ESPTOOL2_BINDIR}/ - ${HAS_ET2} || make
script: script:
- cd ${TRAVIS_BUILD_DIR} - cd ${TRAVIS_BUILD_DIR}