Skip to content

Commit ff22a6a

Browse files
Remove PIO toolchain patch kludge
1 parent dcb0244 commit ff22a6a

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

tests/platformio.sh

+10-8
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,21 @@
33
cache_dir=$(mktemp -d)
44

55
source "$TRAVIS_BUILD_DIR"/tests/common.sh
6-
set -ex
76

87
function install_platformio()
98
{
109
pip3 install --user -U https://github.com./platformio/platformio/archive/develop.zip
1110
platformio platform install "https://github.com./platformio/platform-espressif8266.git"
12-
# Overwrite toolchain with this PR's toolset. Probably better way to do this
13-
( cd $TRAVIS_BUILD_DIR/tools && python3 get.py -q )
14-
mv ~/.platformio/packages/toolchain-xtensa/package.json .save
15-
rm -rf ~/.platformio/packages/toolchain-xtensa
16-
mv $TRAVIS_BUILD_DIR/tools/xtensa-lx106-elf ~/.platformio/packages/toolchain-xtensa
17-
mv .save ~/.platformio/packages/toolchain-xtensa/package.json
18-
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()"
11+
# Note that PIO ignores the requested toolchain. The code below attempted to patch in
12+
# the current Arduino version, but due to recent PIO changes it no longer succeeds.
13+
# Dropping it for now, leaving PIO to pick up whatever toolchain it feels like.
14+
# # Overwrite toolchain with this PR's toolset. Probably better way to do this
15+
# ( cd $TRAVIS_BUILD_DIR/tools && python3 get.py -q )
16+
# mv ~/.platformio/packages/toolchain-xtensa/package.json .save
17+
# rm -rf ~/.platformio/packages/toolchain-xtensa
18+
# mv $TRAVIS_BUILD_DIR/tools/xtensa-lx106-elf ~/.platformio/packages/toolchain-xtensa
19+
# mv .save ~/.platformio/packages/toolchain-xtensa/package.json
20+
# 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()"
1921
ln -sf $TRAVIS_BUILD_DIR ~/.platformio/packages/framework-arduinoespressif8266
2022
# Install dependencies:
2123
# - esp8266/examples/ConfigFile

0 commit comments

Comments
 (0)