]> granicus.if.org Git - esp-idf/commitdiff
ci: don’t look for project CMakeLists in common_components
authorIvan Grokhotkov <ivan@espressif.com>
Wed, 21 Nov 2018 05:54:09 +0000 (13:54 +0800)
committerbot <bot@espressif.com>
Mon, 15 Apr 2019 03:32:05 +0000 (03:32 +0000)
tools/ci/build_examples_cmake.sh
tools/ci/check_examples_cmake_make.sh

index 5772a81d11b206405395436d11d3544def01b1a3..25717f43a3b3ff482f9df60b8aa55d2619d8b6dd 100755 (executable)
@@ -66,7 +66,7 @@ LOG_SUSPECTED=${LOG_PATH}/common_log.txt
 touch ${LOG_SUSPECTED}
 SDKCONFIG_DEFAULTS_CI=sdkconfig.ci
 
-EXAMPLE_PATHS=$( find ${IDF_PATH}/examples/ -type f -name CMakeLists.txt | grep -v "/components/" | grep -v "/main/" | sort )
+EXAMPLE_PATHS=$( find ${IDF_PATH}/examples/ -type f -name CMakeLists.txt | grep -v "/components/" | grep -v "/common_components/" | grep -v "/main/" | sort )
 
 if [ $# -eq 0 ]
 then
index 64463ab2140f0db98b2fe0eede45c68dc33aec7d..ed560a21bcb5efd4e96bddde85bea20bde7432bf 100755 (executable)
@@ -2,7 +2,7 @@
 
 # While we support GNU Make & CMake together, check the same examples are present for both
 
-CMAKE_EXAMPLE_PATHS=$( find ${IDF_PATH}/examples/ -type f -name CMakeLists.txt | grep -v "/components/" | grep -v "/main/" | grep -v "/build_system/cmake/")
+CMAKE_EXAMPLE_PATHS=$( find ${IDF_PATH}/examples/ -type f -name CMakeLists.txt | grep -v "/components/" | grep -v "/common_components/" | grep -v "/main/" | grep -v "/build_system/cmake/")
 MAKE_EXAMPLE_PATHS=$( find ${IDF_PATH}/examples/ -type f -name Makefile | grep -v "/build_system/cmake/")
 
 CMAKE_EXAMPLE_PATHS="$(/usr/bin/dirname $CMAKE_EXAMPLE_PATHS | sort -n)"