Skip to content

Commit 5c76091

Browse files
committed
platformio & arduino installers should share library path
remove explicit package installation for pio
1 parent a157945 commit 5c76091

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

tests/common.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -433,16 +433,20 @@ function install_platformio()
433433
python3 get.py -q
434434
popd
435435

436+
install_libraries "$ESP8266_ARDUINO_BUILD_DIR" "$ESP8266_ARDUINO_LIBRARIES"
437+
436438
# we should reference our up-to-date build tools
437439
# ref. https://docs.platformio.org/en/latest/core/userguide/pkg/cmd_install.html
438440
pio pkg install --global --skip-dependencies --platform "https://github.com/platformio/platform-espressif8266.git"
439441

440442
local framework_symlink="framework-arduinoespressif8266 @ symlink://${ESP8266_ARDUINO_BUILD_DIR}"
441443
local toolchain_symlink="toolchain-xtensa @ symlink://${ESP8266_ARDUINO_BUILD_DIR}/tools/xtensa-lx106-elf/"
442444

443-
# pre-generate config; pio-ci with multiple '-O' replace each other instead of appending to the same named list
444-
# (and, it is much nicer to write this instead of a multi-line cmdline with several large strings)
445+
# pre-generate config; pio-ci with multiple '-O' options replace each other instead of appending to the same named list
445446
cat <<EOF > $cache_dir/platformio.ini
447+
[platformio]
448+
lib_dir =
449+
${ESP8266_ARDUINO_LIBRARIES}
446450
[env:$board]
447451
platform = espressif8266
448452
board = $board
@@ -452,10 +456,6 @@ platform_packages =
452456
${toolchain_symlink}
453457
EOF
454458

455-
# Install dependencies:
456-
# - esp8266/examples/ConfigFile
457-
pio pkg install --global --library "ArduinoJson@^6.11.0"
458-
459459
echo $ci_end_group
460460
}
461461

0 commit comments

Comments
 (0)