From bb552dd19ca480be68ce51aa53bda6795a4e882f Mon Sep 17 00:00:00 2001 From: Renz Christian Bagaporo Date: Tue, 12 Feb 2019 09:55:08 +0800 Subject: [PATCH] ci: use flasher_args.json for cmake ci run --- .gitlab-ci.yml | 2 +- tools/ci/build_examples_cmake.sh | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b745052df..dfff184d3 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 b0039f9a9..5772a81d1 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}" ; }