mirror of
https://github.com/esp8266/Arduino.git
synced 2025-06-26 17:42:18 +03:00
CI - fix pio-ci library dir override (#9257)
pio-run vs. pio-ci configuration differences fixed sketch list for platformio builder
This commit is contained in:
2
.github/workflows/build-platformio.yml
vendored
2
.github/workflows/build-platformio.yml
vendored
@ -36,4 +36,4 @@ jobs:
|
|||||||
ESP8266_ARDUINO_BUILDER: "platformio"
|
ESP8266_ARDUINO_BUILDER: "platformio"
|
||||||
run: |
|
run: |
|
||||||
pip install -U platformio
|
pip install -U platformio
|
||||||
env ESP8266_ARDUINO_SKETCHES="$(find libraries/ -name '*.ino' | shuf -n 10 -)" bash ./tests/build.sh
|
env ESP8266_ARDUINO_SKETCHES="$(find libraries/ -name '*.ino' | grep -e libraries/esp8266/examples -e SoftwareSerial)" bash ./tests/build.sh
|
||||||
|
@ -449,9 +449,6 @@ function install_platformio()
|
|||||||
|
|
||||||
# pre-generate config; pio-ci with multiple '-O' options replace each other instead of appending to the same named list
|
# pre-generate config; pio-ci with multiple '-O' options replace each other instead of appending to the same named list
|
||||||
cat <<EOF > $cache_dir/platformio.ini
|
cat <<EOF > $cache_dir/platformio.ini
|
||||||
[platformio]
|
|
||||||
lib_dir =
|
|
||||||
${ESP8266_ARDUINO_LIBRARIES}
|
|
||||||
[env:$board]
|
[env:$board]
|
||||||
platform = espressif8266
|
platform = espressif8266
|
||||||
board = $board
|
board = $board
|
||||||
@ -461,6 +458,8 @@ platform_packages =
|
|||||||
${toolchain_symlink}
|
${toolchain_symlink}
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
cat $cache_dir/platformio.ini
|
||||||
|
|
||||||
echo $ci_end_group
|
echo $ci_end_group
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -498,8 +497,8 @@ function build_sketches_with_platformio()
|
|||||||
sketchdir=$(dirname $sketch)
|
sketchdir=$(dirname $sketch)
|
||||||
|
|
||||||
local result
|
local result
|
||||||
time pio ci \
|
env PLATFORMIO_LIB_DIR="${ESP8266_ARDUINO_LIBRARIES}" \
|
||||||
--verbose \
|
time pio ci \
|
||||||
--project-conf $cache_dir/platformio.ini \
|
--project-conf $cache_dir/platformio.ini \
|
||||||
$sketchdir >$cache_dir/build.log 2>&1 \
|
$sketchdir >$cache_dir/build.log 2>&1 \
|
||||||
&& result=0 || result=1
|
&& result=0 || result=1
|
||||||
|
Reference in New Issue
Block a user