From 6dec7db1c7126155dcc61ee4004983c05df66732 Mon Sep 17 00:00:00 2001
From: Dong Heng <dongheng@espressif.com>
Date: Wed, 14 Oct 2020 17:22:43 +0800
Subject: [PATCH] chore(CI): Save CI compiling examples's building firmware

---
 .gitlab-ci.yml                   | 12 ++++++++++++
 tools/ci/build_examples.sh       | 16 +++++++++-------
 tools/ci/build_examples_cmake.sh | 14 ++++++++------
 3 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 35717b60..2f02be27 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -115,6 +115,12 @@ build_docs:
     when: always
     paths:
       - $LOG_PATH
+      - ./build_examples/example_builds/*/build/bootloader/*.bin
+      - ./build_examples/example_builds/*/build/partition_table/*.bin
+      - ./build_examples/example_builds/*/build/*.bin
+      - ./build_examples/example_builds/*/build/*.elf
+      - ./build_examples/example_builds/*/build/*.map
+      - ./build_examples/example_builds/*/build/*.config
     expire_in: 2 days
   variables:
     LOG_PATH: "$CI_PROJECT_DIR/log_examples_make"
@@ -142,6 +148,12 @@ build_docs:
     when: always
     paths:
       - $LOG_PATH
+      - ./build_examples_cmake/example_builds/*/build/bootloader/*.bin
+      - ./build_examples_cmake/example_builds/*/build/partition_table/*.bin
+      - ./build_examples_cmake/example_builds/*/build/*.bin
+      - ./build_examples_cmake/example_builds/*/build/*.elf
+      - ./build_examples_cmake/example_builds/*/build/*.map
+      - ./build_examples_cmake/example_builds/*/build/*.config
     expire_in: 2 days
   variables:
     LOG_PATH: "$CI_PROJECT_DIR/log_examples_cmake"
diff --git a/tools/ci/build_examples.sh b/tools/ci/build_examples.sh
index 972b6c3a..b30f5c51 100755
--- a/tools/ci/build_examples.sh
+++ b/tools/ci/build_examples.sh
@@ -118,13 +118,15 @@ build_example () {
     local EXAMPLE_DIR=$(dirname "${MAKE_FILE}")
     local EXAMPLE_NAME=$(basename "${EXAMPLE_DIR}")
 
-    if [[ -f "example_builds/${ID}/${EXAMPLE_NAME}/build/ci_build_success" ]]; then
-        echo "Project ${EXAMPLE_NAME} has been built and skip building ..."
+    local EXAMPLE_BUILD_DIR="${ID}_${EXAMPLE_NAME}"
+
+    if [[ -f "example_builds/${EXAMPLE_BUILD_DIR}/build/ci_build_success" ]]; then
+        echo "Project ${EXAMPLE_BUILD_DIR} has been built and skip building ..."
     else
-        echo "Building ${EXAMPLE_NAME} as ${ID}..."
-        mkdir -p "example_builds/${ID}"
-        cp -r "${EXAMPLE_DIR}" "example_builds/${ID}"
-        pushd "example_builds/${ID}/${EXAMPLE_NAME}"
+        echo "Building ${EXAMPLE_BUILD_DIR}..."
+        mkdir -p "example_builds/${EXAMPLE_BUILD_DIR}"
+        cp -r "${EXAMPLE_DIR}/"* "example_builds/${EXAMPLE_BUILD_DIR}/"
+        pushd "example_builds/${EXAMPLE_BUILD_DIR}"
             # be stricter in the CI build than the default IDF settings
             export EXTRA_CFLAGS="-Werror -Werror=deprecated-declarations"
             export EXTRA_CXXFLAGS=${EXTRA_CFLAGS}
@@ -140,7 +142,7 @@ build_example () {
             fi
 
             # build non-verbose first
-            local BUILDLOG=${LOG_PATH}/ex_${ID}_log.txt
+            local BUILDLOG=${LOG_PATH}/ex_${EXAMPLE_BUILD_DIR}_log.txt
             touch ${BUILDLOG}
 
             local FLASH_ARGS=build/download.config
diff --git a/tools/ci/build_examples_cmake.sh b/tools/ci/build_examples_cmake.sh
index 2774f79e..914dbcc2 100755
--- a/tools/ci/build_examples_cmake.sh
+++ b/tools/ci/build_examples_cmake.sh
@@ -132,13 +132,15 @@ build_example () {
     local EXAMPLE_DIR=$(dirname "${CMAKELISTS}")
     local EXAMPLE_NAME=$(basename "${EXAMPLE_DIR}")
 
-    if [[ -f "example_builds/${ID}/${EXAMPLE_NAME}/build/ci_build_success" ]]; then
+    local EXAMPLE_BUILD_DIR="${ID}_${EXAMPLE_NAME}"
+
+    if [[ -f "example_builds/${EXAMPLE_BUILD_DIR}/build/ci_build_success" ]]; then
         echo "Project ${EXAMPLE_NAME} has been built and skip building ..."
     else
-        echo "Building ${EXAMPLE_NAME} as ${ID}..."
-        mkdir -p "example_builds/${ID}"
-        cp -r "${EXAMPLE_DIR}" "example_builds/${ID}"
-        pushd "example_builds/${ID}/${EXAMPLE_NAME}"
+        echo "Building ${EXAMPLE_BUILD_DIR}..."
+        mkdir -p "example_builds/${EXAMPLE_BUILD_DIR}"
+        cp -r "${EXAMPLE_DIR}/"* "example_builds/${EXAMPLE_BUILD_DIR}"
+        pushd "example_builds/${EXAMPLE_BUILD_DIR}"
             # be stricter in the CI build than the default IDF settings
             export EXTRA_CFLAGS="-Werror -Werror=deprecated-declarations"
             export EXTRA_CXXFLAGS=${EXTRA_CFLAGS}
@@ -156,7 +158,7 @@ build_example () {
             fi
 
             # build non-verbose first
-            local BUILDLOG=${LOG_PATH}/ex_${ID}_log.txt
+            local BUILDLOG=${LOG_PATH}/ex_${EXAMPLE_BUILD_DIR}_log.txt
             touch ${BUILDLOG}
 
             idf.py build >>${BUILDLOG} 2>&1 &&