From fdba8f4b309d0ac3522996f77cd8ea78aab6434d Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Sun, 26 Nov 2017 19:10:32 +0200 Subject: [PATCH 1/2] Don't escape folders which are already arguments --- tools/platformio-build.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/platformio-build.py b/tools/platformio-build.py index e1451d41a43..951ca71fa5d 100644 --- a/tools/platformio-build.py +++ b/tools/platformio-build.py @@ -109,9 +109,9 @@ ], UPLOADERFLAGS=[ - "0x1000", '"%s"' % join(FRAMEWORK_DIR, "tools", "sdk", "bin", "bootloader.bin"), - "0x8000", '"%s"' % join("$BUILD_DIR", "partitions.bin"), - "0xe000", '"%s"' % join(FRAMEWORK_DIR, "tools", "partitions", "boot_app0.bin"), + "0x1000", join(FRAMEWORK_DIR, "tools", "sdk", "bin", "bootloader_${BOARD_FLASH_MODE}_${__get_board_f_flash(__env__)}.bin"), + "0x8000", join("$BUILD_DIR", "partitions.bin"), + "0xe000", join(FRAMEWORK_DIR, "tools", "partitions", "boot_app0.bin"), "0x10000" ] ) From 444eff25450206bf3ca8d251c01900d6d77d1645 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Sun, 26 Nov 2017 19:12:15 +0200 Subject: [PATCH 2/2] Drop "stage" suffix from @platformio dev/platform --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9277b51f228..04eba078a6f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,7 @@ script: - echo -e "travis_fold:start:platformio_test_env_prepare" - pip install -U https://github.com/platformio/platformio/archive/develop.zip - platformio platform install https://github.com/platformio/platform-espressif32.git#feature/stage - - sed -i 's/https:\/\/github\.com\/espressif\/arduino-esp32\.git/*/' ~/.platformio/platforms/espressif32_stage/platform.json + - sed -i 's/https:\/\/github\.com\/espressif\/arduino-esp32\.git/*/' ~/.platformio/platforms/espressif32/platform.json - ln -s $TRAVIS_BUILD_DIR ~/.platformio/packages/framework-arduinoespressif32 - echo -e "travis_fold:end:platformio_test_env_prepare" - echo -e "travis_fold:start:platformio_test"