From: Renz Christian Bagaporo Date: Tue, 12 Feb 2019 01:55:08 +0000 (+0800) Subject: ci: use flasher_args.json for cmake ci run X-Git-Tag: v3.3-beta2~52^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bb552dd19ca480be68ce51aa53bda6795a4e882f;p=esp-idf ci: use flasher_args.json for cmake ci run --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b745052dfc..dfff184d30 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -272,7 +272,7 @@ build_esp_idf_tests_cmake: - build_examples_cmake/*/*/*/sdkconfig - build_examples_cmake/*/*/*/build/*.elf - build_examples_cmake/*/*/*/build/*.map - - build_examples_cmake/*/*/*/build/download.config + - build_examples_cmake/*/*/*/build/flasher_args.json - build_examples_cmake/*/*/*/build/bootloader/*.bin - $LOG_PATH expire_in: 2 days diff --git a/tools/ci/build_examples_cmake.sh b/tools/ci/build_examples_cmake.sh index b0039f9a92..5772a81d11 100755 --- a/tools/ci/build_examples_cmake.sh +++ b/tools/ci/build_examples_cmake.sh @@ -144,7 +144,6 @@ build_example () { rm -rf build && ./build.sh >>${BUILDLOG} 2>&1 fi && - cp build/flash_project_args build/download.config || # backwards compatible download.config filename { RESULT=$?; FAILED_EXAMPLES+=" ${EXAMPLE_NAME}" ; }