diff --git a/.travis.yml b/.travis.yml index 03a923a4..bea38bfc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,12 +11,12 @@ cache: - directories: - cache before_install: -- pip install --user hererocks +- pip install --user hererocks esptool - hererocks env --lua 5.1 -rlatest - source env/bin/activate - luarocks install luafilesystem install: -- tar -zxvf tools/esp-open-sdk.tar.gz +- tar -Jxvf tools/esp-open-sdk.tar.xz - export PATH=$PATH:$PWD/esp-open-sdk/xtensa-lx106-elf/bin script: - lua tools/cross-lua.lua || exit 1 diff --git a/tools/esp-open-sdk.tar.gz b/tools/esp-open-sdk.tar.gz deleted file mode 100644 index 860ef4bc..00000000 Binary files a/tools/esp-open-sdk.tar.gz and /dev/null differ diff --git a/tools/esp-open-sdk.tar.xz b/tools/esp-open-sdk.tar.xz new file mode 100644 index 00000000..8027f504 Binary files /dev/null and b/tools/esp-open-sdk.tar.xz differ diff --git a/tools/pr-build.sh b/tools/pr-build.sh index 7f715479..361dd4ab 100644 --- a/tools/pr-build.sh +++ b/tools/pr-build.sh @@ -19,11 +19,6 @@ sed -E -i.bak 's@// ?#define DEVELOP_VERSION@#define DEVELOP_VERSION@' user_conf sed -i 's@//#define BUILD_FATFS@#define BUILD_FATFS@' user_config.h cat user_config.h -cd "$TRAVIS_BUILD_DIR"/ld || exit -# increase irom0_0_seg size for all modules build -sed -E -i.bak 's@(.*irom0_0_seg *:.*len *=) *[^,]*(.*)@\1 0xD0000\2@' nodemcu.ld -cat nodemcu.ld - # change to "root" directory no matter where the script was started from cd "$TRAVIS_BUILD_DIR" || exit make clean