Merge branch 'tools/add_idf_v6.0_to_ci' into 'master'

tools(ci): Add IDF release-v6.0 image to CI

See merge request espressif/esp-video-components!357

Author: donghengqaz

.gitlab/ci/build.yml

@@ -40,7 +40,7 @@
     - export EXTRA_CXXFLAGS="${PEDANTIC_FLAGS}"
     - python tools/ci/build_apps.py --targets $IDF_TARGETS
 
-build_test_esp32p4:
+build_test_esp32p4_idf_v5.x:
   extends:
     - .build_examples_template
     - .rules:build:test_apps
@@ -51,19 +51,30 @@ build_test_esp32p4:
     matrix:
       - IMAGE: [espressif/idf:release-v5.4, espressif/idf:release-v5.5]
 
+build_test_esp32p4_idf_v6.x:
+  extends:
+    - .build_examples_template
+    - .rules:build:test_apps
+  variables:
+    IDF_TARGETS: "esp32p4"
+    IDF_BUILD_APPS_VERSION: "2.13.3"
+  parallel:
+    matrix:
+      - IMAGE: [espressif/idf:release-v6.0]
+
 build_test_esp32p4_idf_latest:
   extends:
     - .build_examples_template
     - .rules:build:test_apps
     - .rules:build:idf_latest
   variables:
     IDF_TARGETS: "esp32p4"
-    IDF_BUILD_APPS_VERSION: "2.13.1"
+    IDF_BUILD_APPS_VERSION: "2.13.3"
   parallel:
     matrix:
       - IMAGE: [espressif/idf:latest]
 
-build_test_s3_c3_c6:
+build_test_s3_c3_c6_idf_v5.x:
   extends:
     - .build_examples_template
     - .rules:build:test_apps
@@ -74,19 +85,30 @@ build_test_s3_c3_c6:
     matrix:
       - IMAGE: [espressif/idf:release-v5.4, espressif/idf:release-v5.5]
 
+build_test_s3_c3_c6_idf_v6.x:
+  extends:
+    - .build_examples_template
+    - .rules:build:test_apps
+  variables:
+    IDF_TARGETS: "esp32s3;esp32c3;esp32c6"
+    IDF_BUILD_APPS_VERSION: "2.13.3"
+  parallel:
+    matrix:
+      - IMAGE: [espressif/idf:release-v6.0]
+
 build_test_s3_c3_c6_idf_latest:
   extends:
     - .build_examples_template
     - .rules:build:test_apps
     - .rules:build:idf_latest
   variables:
     IDF_TARGETS: "esp32s3;esp32c3;esp32c6"
-    IDF_BUILD_APPS_VERSION: "2.13.1"
+    IDF_BUILD_APPS_VERSION: "2.13.3"
   parallel:
     matrix:
       - IMAGE: [espressif/idf:latest]
 
-build_test_c5_c61:
+build_test_c5_c61_idf_v5.x:
   extends:
     - .build_examples_template
     - .rules:build:test_apps
@@ -97,14 +119,25 @@ build_test_c5_c61:
     matrix:
       - IMAGE: [espressif/idf:release-v5.5]
 
+build_test_c5_c61_idf_v6.x:
+  extends:
+    - .build_examples_template
+    - .rules:build:test_apps
+  variables:
+    IDF_TARGETS: "esp32c5;esp32c61"
+    IDF_BUILD_APPS_VERSION: "2.13.3"
+  parallel:
+    matrix:
+      - IMAGE: [espressif/idf:release-v6.0]
+
 build_test_c5_c61_idf_latest:
   extends:
     - .build_examples_template
     - .rules:build:test_apps
     - .rules:build:idf_latest
   variables:
     IDF_TARGETS: "esp32c5;esp32c61"
-    IDF_BUILD_APPS_VERSION: "2.13.1"
+    IDF_BUILD_APPS_VERSION: "2.13.3"
   parallel:
     matrix:
       - IMAGE: [espressif/idf:latest]

esp_ipa/test_apps/.build-test-rules.yml

@@ -1,4 +1,4 @@
-test_apps/dummy:
+esp_ipa/test_apps/dummy:
   enable:
     - if: IDF_TARGET == "esp32p4"
       reason: only support on esp32p4

esp_video/examples/simple_video_server/main/idf_component.yml

@@ -9,3 +9,7 @@ dependencies:
   espressif/mdns: "^1.0.3"
   esp_wifi_remote:
     version: "*"
+  espressif/cjson:
+    version: "^1.7.15"
+    rules:
+      - if: "idf_version >= 6.0"

tools/ci/build_apps.py

@@ -17,18 +17,35 @@
 DEFAULT_IGNORE_WARNING_FILEPATH = [os.path.join('tools', 'ci', 'ignore_build_warnings.txt')]
 PREVIEW_TARGETS = []
 
+CI_BUILD_ALL_FILES = ['esp_cam_sensor/CMakeLists.txt', 'esp_ipa/CMakeLists.txt', 'esp_video/CMakeLists.txt', 'esp_sccb_intf/CMakeLists.txt']
+
 logger = logging.getLogger('idf_build_apps')
 
 def get_mr_files(modified_files: str) -> str:
     if modified_files is None:
         return ''
-    return modified_files.split(' ')
+    modified_files = modified_files.split(' ')
+
+    # If change to CI related files, we need to build all components
+    for f in modified_files:
+        if '.gitlab/ci/' in f:
+            modified_files = CI_BUILD_ALL_FILES
+            break
+
+    return modified_files
 
 def get_mr_components(modified_files: str) -> str:
     if modified_files is None:
         return ''
     components: t.Set[str] = set()
     modified_files = modified_files.split(' ')
+
+    # If change to CI related files, we need to build all components
+    for f in modified_files:
+        if '.gitlab/ci/' in f:
+            modified_files = CI_BUILD_ALL_FILES
+            break
+
     for f in modified_files:
         file = Path(f)
         if (
@@ -69,6 +86,7 @@ def find_all_apps(root: str, manifest_files: list[str], modified_components: lis
             modified_components=modified_components,
             modified_files=modified_files,
             manifest_files=manifest_files,
+            verbose=1,
         )
 
     match_apps = []
@@ -111,14 +129,25 @@ def find_all_apps(root: str, manifest_files: list[str], modified_components: lis
     for f in DEFAULT_IGNORE_WARNING_FILEPATH:
         ignore_warning_strs.extend(open(f).read().splitlines())
 
-    ret_code = build_apps(
-        apps_to_build,
-        collect_size_info='size_info.txt',
-        dry_run=False,
-        keep_going=True,
-        ignore_warning_strs=ignore_warning_strs,
-        copy_sdkconfig=True
-    )
+    if idf_build_apps_version == '1.1.4':
+        ret_code = build_apps(
+            apps_to_build,
+            collect_size_info='size_info.txt',
+            dry_run=False,
+            keep_going=True,
+            ignore_warning_strs=ignore_warning_strs,
+            copy_sdkconfig=True,
+        )
+    else:
+        ret_code = build_apps(
+            apps_to_build,
+            collect_size_info='size_info.txt',
+            dry_run=False,
+            keep_going=True,
+            ignore_warning_strs=ignore_warning_strs,
+            copy_sdkconfig=True,
+            verbose=1,
+        )
 
     sys.exit(ret_code)