Skip to content

Commit 8126849

Browse files
authored
CI - fix pio-ci library dir override (#9257)
pio-run vs. pio-ci configuration differences fixed sketch list for platformio builder
1 parent d4dcda2 commit 8126849

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

.github/workflows/build-platformio.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@ jobs:
3636
ESP8266_ARDUINO_BUILDER: "platformio"
3737
run: |
3838
pip install -U platformio
39-
env ESP8266_ARDUINO_SKETCHES="$(find libraries/ -name '*.ino' | shuf -n 10 -)" bash ./tests/build.sh
39+
env ESP8266_ARDUINO_SKETCHES="$(find libraries/ -name '*.ino' | grep -e libraries/esp8266/examples -e SoftwareSerial)" bash ./tests/build.sh

tests/common.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -449,9 +449,6 @@ function install_platformio()
449449

450450
# pre-generate config; pio-ci with multiple '-O' options replace each other instead of appending to the same named list
451451
cat <<EOF > $cache_dir/platformio.ini
452-
[platformio]
453-
lib_dir =
454-
${ESP8266_ARDUINO_LIBRARIES}
455452
[env:$board]
456453
platform = espressif8266
457454
board = $board
@@ -461,6 +458,8 @@ platform_packages =
461458
${toolchain_symlink}
462459
EOF
463460

461+
cat $cache_dir/platformio.ini
462+
464463
echo $ci_end_group
465464
}
466465

@@ -498,8 +497,8 @@ function build_sketches_with_platformio()
498497
sketchdir=$(dirname $sketch)
499498

500499
local result
501-
time pio ci \
502-
--verbose \
500+
env PLATFORMIO_LIB_DIR="${ESP8266_ARDUINO_LIBRARIES}" \
501+
time pio ci \
503502
--project-conf $cache_dir/platformio.ini \
504503
$sketchdir >$cache_dir/build.log 2>&1 \
505504
&& result=0 || result=1

0 commit comments

Comments
 (0)