From dcb024446e1b9ac8db12e51a1a5e6cca21aa7da5 Mon Sep 17 00:00:00 2001 From: "Earle F. Philhower, III" Date: Sun, 16 Aug 2020 10:53:57 -0700 Subject: [PATCH 1/3] Update PIO CI to be less chatty, fix CI fail --- tests/platformio.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/platformio.sh b/tests/platformio.sh index 7e834fb6de..3bbc5d87f6 100755 --- a/tests/platformio.sh +++ b/tests/platformio.sh @@ -3,13 +3,14 @@ cache_dir=$(mktemp -d) source "$TRAVIS_BUILD_DIR"/tests/common.sh +set -ex function install_platformio() { pip3 install --user -U https://github.com/platformio/platformio/archive/develop.zip platformio platform install "https://github.com/platformio/platform-espressif8266.git" # Overwrite toolchain with this PR's toolset. Probably better way to do this - ( cd $TRAVIS_BUILD_DIR/tools && python3 get.py ) + ( cd $TRAVIS_BUILD_DIR/tools && python3 get.py -q ) mv ~/.platformio/packages/toolchain-xtensa/package.json .save rm -rf ~/.platformio/packages/toolchain-xtensa mv $TRAVIS_BUILD_DIR/tools/xtensa-lx106-elf ~/.platformio/packages/toolchain-xtensa From ff22a6ab8809bc8d69870558a065d78f231433b0 Mon Sep 17 00:00:00 2001 From: "Earle F. Philhower, III" Date: Sun, 16 Aug 2020 10:59:41 -0700 Subject: [PATCH 2/3] Remove PIO toolchain patch kludge --- tests/platformio.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/tests/platformio.sh b/tests/platformio.sh index 3bbc5d87f6..a1259f8670 100755 --- a/tests/platformio.sh +++ b/tests/platformio.sh @@ -3,19 +3,21 @@ cache_dir=$(mktemp -d) source "$TRAVIS_BUILD_DIR"/tests/common.sh -set -ex function install_platformio() { pip3 install --user -U https://github.com/platformio/platformio/archive/develop.zip platformio platform install "https://github.com/platformio/platform-espressif8266.git" - # Overwrite toolchain with this PR's toolset. Probably better way to do this - ( cd $TRAVIS_BUILD_DIR/tools && python3 get.py -q ) - mv ~/.platformio/packages/toolchain-xtensa/package.json .save - rm -rf ~/.platformio/packages/toolchain-xtensa - mv $TRAVIS_BUILD_DIR/tools/xtensa-lx106-elf ~/.platformio/packages/toolchain-xtensa - mv .save ~/.platformio/packages/toolchain-xtensa/package.json - python -c "import json; import os; fp=open(os.path.expanduser('~/.platformio/platforms/espressif8266/platform.json'), 'r+'); data=json.load(fp); data['packages']['framework-arduinoespressif8266']['version'] = '*'; fp.seek(0); fp.truncate(); json.dump(data, fp); fp.close()" +# Note that PIO ignores the requested toolchain. The code below attempted to patch in +# the current Arduino version, but due to recent PIO changes it no longer succeeds. +# Dropping it for now, leaving PIO to pick up whatever toolchain it feels like. +# # Overwrite toolchain with this PR's toolset. Probably better way to do this +# ( cd $TRAVIS_BUILD_DIR/tools && python3 get.py -q ) +# mv ~/.platformio/packages/toolchain-xtensa/package.json .save +# rm -rf ~/.platformio/packages/toolchain-xtensa +# mv $TRAVIS_BUILD_DIR/tools/xtensa-lx106-elf ~/.platformio/packages/toolchain-xtensa +# mv .save ~/.platformio/packages/toolchain-xtensa/package.json +# python -c "import json; import os; fp=open(os.path.expanduser('~/.platformio/platforms/espressif8266/platform.json'), 'r+'); data=json.load(fp); data['packages']['framework-arduinoespressif8266']['version'] = '*'; fp.seek(0); fp.truncate(); json.dump(data, fp); fp.close()" ln -sf $TRAVIS_BUILD_DIR ~/.platformio/packages/framework-arduinoespressif8266 # Install dependencies: # - esp8266/examples/ConfigFile From fa2bbc96ee2ce5602c19bc25a80bd4934b5bb92c Mon Sep 17 00:00:00 2001 From: "Earle F. Philhower, III" Date: Sun, 16 Aug 2020 11:32:23 -0700 Subject: [PATCH 3/3] Use latest release version of PIO, not bleeding edge --- tests/platformio.sh | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/tests/platformio.sh b/tests/platformio.sh index a1259f8670..2aa81a656a 100755 --- a/tests/platformio.sh +++ b/tests/platformio.sh @@ -6,18 +6,15 @@ source "$TRAVIS_BUILD_DIR"/tests/common.sh function install_platformio() { - pip3 install --user -U https://github.com/platformio/platformio/archive/develop.zip + pip3 install -U platformio platformio platform install "https://github.com/platformio/platform-espressif8266.git" -# Note that PIO ignores the requested toolchain. The code below attempted to patch in -# the current Arduino version, but due to recent PIO changes it no longer succeeds. -# Dropping it for now, leaving PIO to pick up whatever toolchain it feels like. -# # Overwrite toolchain with this PR's toolset. Probably better way to do this -# ( cd $TRAVIS_BUILD_DIR/tools && python3 get.py -q ) -# mv ~/.platformio/packages/toolchain-xtensa/package.json .save -# rm -rf ~/.platformio/packages/toolchain-xtensa -# mv $TRAVIS_BUILD_DIR/tools/xtensa-lx106-elf ~/.platformio/packages/toolchain-xtensa -# mv .save ~/.platformio/packages/toolchain-xtensa/package.json -# python -c "import json; import os; fp=open(os.path.expanduser('~/.platformio/platforms/espressif8266/platform.json'), 'r+'); data=json.load(fp); data['packages']['framework-arduinoespressif8266']['version'] = '*'; fp.seek(0); fp.truncate(); json.dump(data, fp); fp.close()" + # Overwrite toolchain with this PR's toolset. Probably better way to do this + ( cd $TRAVIS_BUILD_DIR/tools && python3 get.py -q ) + mv ~/.platformio/packages/toolchain-xtensa/package.json .save + rm -rf ~/.platformio/packages/toolchain-xtensa + mv $TRAVIS_BUILD_DIR/tools/xtensa-lx106-elf ~/.platformio/packages/toolchain-xtensa + mv .save ~/.platformio/packages/toolchain-xtensa/package.json + python -c "import json; import os; fp=open(os.path.expanduser('~/.platformio/platforms/espressif8266/platform.json'), 'r+'); data=json.load(fp); data['packages']['framework-arduinoespressif8266']['version'] = '*'; fp.seek(0); fp.truncate(); json.dump(data, fp); fp.close()" ln -sf $TRAVIS_BUILD_DIR ~/.platformio/packages/framework-arduinoespressif8266 # Install dependencies: # - esp8266/examples/ConfigFile