From 97b461fda1e68f5348b607df77fdb2abfbebed78 Mon Sep 17 00:00:00 2001
From: Lucas Saavedra Vaz <32426024+lucasssvaz@users.noreply.github.com>
Date: Fri, 27 Sep 2024 23:28:22 -0300
Subject: [PATCH 1/8] ci(json): Add support for checking sdkconfig before
 running tests

---
 .github/scripts/install-platformio-esp32.sh | 47 +++++++++++++++++----
 .github/scripts/sketch_utils.sh             | 44 +++++++++++++------
 .github/scripts/tests_run.sh                | 29 +++++++++----
 3 files changed, 89 insertions(+), 31 deletions(-)

diff --git a/.github/scripts/install-platformio-esp32.sh b/.github/scripts/install-platformio-esp32.sh
index a92e1103770..35ac29966b7 100755
--- a/.github/scripts/install-platformio-esp32.sh
+++ b/.github/scripts/install-platformio-esp32.sh
@@ -6,6 +6,7 @@ PLATFORMIO_ESP32_URL="https://github.com/platformio/platform-espressif32.git"
 TOOLCHAIN_VERSION="12.2.0+20230208"
 ESPTOOLPY_VERSION="~1.40501.0"
 ESPRESSIF_ORGANIZATION_NAME="espressif"
+LIBS_DIR="tools/esp32-arduino-libs"
 
 echo "Installing Python Wheel ..."
 pip install wheel > /dev/null 2>&1
@@ -88,12 +89,25 @@ function count_sketches(){ # count_sketches <examples-path>
         local sketchname=$(basename $sketch)
         if [[ "${sketchdirname}.ino" != "$sketchname" ]]; then
             continue
+        elif [ -f $sketchdir/ci.json ]; then
+            # If the target is listed as false, skip the sketch. Otherwise, include it.
+            is_target=$(jq -r '.targets[esp32]' $sketchdir/ci.json)
+            if [[ "$is_target" == "false" ]]; then
+                continue
+            fi
+
+            # Check if the sketch requires any configuration options
+            requirements=$(jq -r '.requires[]? // empty' $sketchdir/ci.json)
+            if [[ "$requirements" != "null" ]] || [[ "$requirements" != "" ]]; then
+                for requirement in $requirements; do
+                    found_line=$(grep "$requirement" $LIBS_DIR/esp32/sdkconfig)
+                    if [[ "$found_line" == "" ]]; then
+                        continue 2
+                    fi
+                done
+            fi
         fi
-        is_target=$(jq -r --arg target $target '.targets[$target]' $sketchdir/ci.json)
-        # If the target is listed as false, skip the sketch. Otherwise, include it.
-        if [[ "$is_target" == "false" ]]; then
-            continue
-        fi
+
         echo $sketch >> sketches.txt
         sketchnum=$(($sketchnum + 1))
     done
@@ -163,12 +177,27 @@ function build_pio_sketches(){ # build_pio_sketches <board> <options> <examples-
         local sketchdir=$(dirname $sketch)
         local sketchdirname=$(basename $sketchdir)
         local sketchname=$(basename $sketch)
-        is_target=$(jq -r --arg target $target '.targets[$target]' $sketchdir/ci.json)
-        # If the target is listed as false, skip the sketch. Otherwise, include it.
-        if [ "${sketchdirname}.ino" != "$sketchname" ] \
-        || [[ "$is_target" == "false" ]]; then
+        if [[ "$sketchdirname.ino" != "$sketchname" ]]; then
             continue
+        elif [ -f $sketchdir/ci.json ]; then
+            # If the target is listed as false, skip the sketch. Otherwise, include it.
+            is_target=$(jq -r '.targets[esp32]' $sketchdir/ci.json)
+            if [[ "$is_target" == "false" ]]; then
+                continue
+            fi
+
+            # Check if the sketch requires any configuration options
+            requirements=$(jq -r '.requires[]? // empty' $sketchdir/ci.json)
+            if [[ "$requirements" != "null" ]] || [[ "$requirements" != "" ]]; then
+                for requirement in $requirements; do
+                    found_line=$(grep "$requirement" $LIBS_DIR/esp32/sdkconfig)
+                    if [[ "$found_line" == "" ]]; then
+                        continue 2
+                    fi
+                done
+            fi
         fi
+
         sketchnum=$(($sketchnum + 1))
         if [ "$sketchnum" -le "$start_index" ] \
         || [ "$sketchnum" -gt "$end_index" ]; then
diff --git a/.github/scripts/sketch_utils.sh b/.github/scripts/sketch_utils.sh
index 813f61210cd..bf2c69b3ccc 100755
--- a/.github/scripts/sketch_utils.sh
+++ b/.github/scripts/sketch_utils.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+LIBS_DIR="tools/esp32-arduino-libs"
+
 function build_sketch(){ # build_sketch <ide_path> <user_path> <path-to-ino> [extra-options]
     while [ ! -z "$1" ]; do
         case "$1" in
@@ -140,16 +142,25 @@ function build_sketch(){ # build_sketch <ide_path> <user_path> <path-to-ino> [ex
 
     sketchname=$(basename $sketchdir)
 
-    # If the target is listed as false, skip the sketch. Otherwise, include it.
     if [ -f $sketchdir/ci.json ]; then
+        # If the target is listed as false, skip the sketch. Otherwise, include it.
         is_target=$(jq -r --arg target $target '.targets[$target]' $sketchdir/ci.json)
-    else
-        is_target="true"
-    fi
+        if [[ "$is_target" == "false" ]]; then
+            echo "Skipping $sketchname for target $target"
+            exit 0
+        fi
 
-    if [[ "$is_target" == "false" ]]; then
-        echo "Skipping $sketchname for target $target"
-        exit 0
+        # Check if the sketch requires any configuration options
+        requirements=$(jq -r '.requires[]? // empty' $sketchdir/ci.json)
+        if [[ "$requirements" != "null" ]] || [[ "$requirements" != "" ]]; then
+            for requirement in $requirements; do
+                found_line=$(grep "$requirement" $LIBS_DIR/$target/sdkconfig)
+                if [[ "$found_line" == "" ]]; then
+                    echo "Target $target does not meet the requirement $requirement for $sketchname. Skipping."
+                    exit 0
+                fi
+            done
+        fi
     fi
 
     ARDUINO_CACHE_DIR="$HOME/.arduino/cache.tmp"
@@ -288,16 +299,23 @@ function count_sketches(){ # count_sketches <path> [target] [file]
         local sketchname=$(basename $sketch)
         if [[ "$sketchdirname.ino" != "$sketchname" ]]; then
             continue
-        elif [[ -n $target ]]; then
+        elif [[ -n $target ]] && [[ -f $sketchdir/ci.json ]]; then
             # If the target is listed as false, skip the sketch. Otherwise, include it.
-            if [ -f $sketchdir/ci.json ]; then
-                is_target=$(jq -r --arg target $target '.targets[$target]' $sketchdir/ci.json)
-            else
-                is_target="true"
-            fi
+            is_target=$(jq -r --arg target $target '.targets[$target]' $sketchdir/ci.json)
             if [[ "$is_target" == "false" ]]; then
                 continue
             fi
+
+            # Check if the sketch requires any configuration options
+            requirements=$(jq -r '.requires[]? // empty' $sketchdir/ci.json)
+            if [[ "$requirements" != "null" ]] || [[ "$requirements" != "" ]]; then
+                for requirement in $requirements; do
+                    found_line=$(grep "$requirement" $LIBS_DIR/$target/sdkconfig)
+                    if [[ "$found_line" == "" ]]; then
+                        continue 2
+                    fi
+                done
+            fi
         fi
         echo $sketch >> sketches.txt
         sketchnum=$(($sketchnum + 1))
diff --git a/.github/scripts/tests_run.sh b/.github/scripts/tests_run.sh
index d53d900e8fa..bdf1f6d1e19 100755
--- a/.github/scripts/tests_run.sh
+++ b/.github/scripts/tests_run.sh
@@ -10,19 +10,29 @@ function run_test() {
     local result=0
     local error=0
 
-    # If the target or platform is listed as false, skip the sketch. Otherwise, include it.
     if [ -f $sketchdir/ci.json ]; then
+        # If the target or platform is listed as false, skip the sketch. Otherwise, include it.
         is_target=$(jq -r --arg target $target '.targets[$target]' $sketchdir/ci.json)
         selected_platform=$(jq -r --arg platform $platform '.platforms[$platform]' $sketchdir/ci.json)
-    else
-        is_target="true"
-        selected_platform="true"
-    fi
 
-    if [[ $is_target == "false" ]] || [[ $selected_platform == "false" ]]; then
-      printf "\033[93mSkipping $sketchname test for $target, platform: $platform\033[0m\n"
-      printf "\n\n\n"
-      return 0
+        if [[ $is_target == "false" ]] || [[ $selected_platform == "false" ]]; then
+            printf "\033[93mSkipping $sketchname test for $target, platform: $platform\033[0m\n"
+            printf "\n\n\n"
+            return 0
+        fi
+
+        # Check if the sketch requires any configuration options
+        requirements=$(jq -r '.requires[]? // empty' $sketchdir/ci.json)
+        if [[ "$requirements" != "null" ]] || [[ "$requirements" != "" ]]; then
+            for requirement in $requirements; do
+                found_line=$(grep "$requirement" $LIBS_DIR/$target/sdkconfig)
+                if [[ "$found_line" == "" ]]; then
+                    printf "\033[93mTarget $target does not meet the requirement $requirement for $sketchname. Skipping.\033[0m\n"
+                    printf "\n\n\n"
+                    return 0
+                fi
+            done
+        fi
     fi
 
     if [ $options -eq 0 ] && [ -f $sketchdir/ci.json ]; then
@@ -110,6 +120,7 @@ function run_test() {
 
 SCRIPTS_DIR="./.github/scripts"
 COUNT_SKETCHES="${SCRIPTS_DIR}/sketch_utils.sh count"
+LIBS_DIR="tools/esp32-arduino-libs"
 
 platform="hardware"
 wokwi_timeout=60000

From 795c436d0338843770a7958074a33b944cf25774 Mon Sep 17 00:00:00 2001
From: Lucas Saavedra Vaz <32426024+lucasssvaz@users.noreply.github.com>
Date: Fri, 27 Sep 2024 23:28:53 -0300
Subject: [PATCH 2/8] docs(ci): Add explanation about requires field in JSON

---
 docs/en/contributing.rst | 47 ++++++++++++++++++++++++++++++----------
 1 file changed, 36 insertions(+), 11 deletions(-)

diff --git a/docs/en/contributing.rst b/docs/en/contributing.rst
index acea254c3e3..3eac77aaf65 100644
--- a/docs/en/contributing.rst
+++ b/docs/en/contributing.rst
@@ -109,17 +109,39 @@ Also:
 Testing
 *******
 
-Be sure you have tested the example in all the supported targets. If the example works only with specific targets,
-edit/add the ``ci.json`` in the same folder as the sketch to specify the supported targets. By default,
-all targets are assumed to be supported.
+Be sure you have tested the example in all the supported targets. If the example some specific hardware requirements,
+edit/add the ``ci.json`` in the same folder as the sketch to specify the required configurations from ``sdkconfig``.
+This will ensure that the CI system will run the test only on the targets that have the required configurations.
+You can check the available configurations in the ``sdkconfig`` file in the ``tools/esp32-arduino-libs/<target>`` folder.
 
-Here is an example of the ``ci.json`` file where the example does not support ESP32-H2 and ESP32-S2:
+Here is an example of the ``ci.json`` file where the example requires Wi-Fi to work properly:
 
 .. code-block:: json
 
     {
+      "requires": [
+        "CONFIG_SOC_WIFI_SUPPORTED=y"
+      ]
+    }
+
+.. note::
+
+    The list of configurations will be checked against the ``sdkconfig`` file in the target folder. If the configuration is not present in the ``sdkconfig``,
+    the test will be skipped for that target. That means that the test will only run on the targets that have **ALL** the required configurations.
+
+Sometimes, the example might not be supported by some target, even if the target has the required configurations
+(like resources limitations or requiring a specific SoC). To avoid compilation errors, you can add the target to the ``ci.json``
+file so the CI system will force to skip the test on that target.
+
+Here is an example of the ``ci.json`` file where the example is requires Wi-Fi to work properly but is also not supported by the ESP32-S2 target:
+
+.. code-block:: json
+
+    {
+      "requires": [
+        "CONFIG_SOC_WIFI_SUPPORTED=y"
+      ],
       "targets": {
-        "esp32h2": false,
         "esp32s2": false
       }
     }
@@ -130,17 +152,17 @@ For example, in the sketch:
 .. code-block:: arduino
 
     /*
-      THIS FEATURE IS SUPPORTED ONLY BY ESP32-S2 AND ESP32-C3
+      THIS FEATURE REQUIRES WI-FI SUPPORT AND IS NOT AVAILABLE FOR ESP32-S2 AS IT DOES NOT HAVE ENOUGH RAM.
     */
 
 And in the ``README.md`` file:
 
 .. code-block:: markdown
 
-    Currently, this example supports the following targets.
+    Currently, this example requires Wi-Fi and supports the following targets.
 
-    | Supported Targets | ESP32 | ESP32-S2 | ESP32-C3 | ESP32-S3 |
-    | ----------------- | ----- | -------- | -------- | -------- |
+    | Supported Targets | ESP32 | ESP32-H2 | ESP32-S3 | ESP32-C3 | ESP32-C6 |
+    | ----------------- | ----- | -------- | -------- | -------- | -------- |
 
 Example Template
 ****************
@@ -341,8 +363,11 @@ CI JSON File
 
 The ``ci.json`` file is used to specify how the test suite and sketches will handled by the CI system. It can contain the following fields:
 
-* ``targets``: A dictionary that specifies the supported targets. The key is the target name and the value is a boolean that specifies if the
-  target is supported. By default, all targets are assumed to be supported. This field is also valid for examples.
+* ``requires``: A list of configurations in ``sdkconfig`` that are required to run the test suite. The test suite will only run on the targets
+  that have the required configurations. By default, no configurations are required.
+* ``targets``: A dictionary that specifies the targets for which the tests will be run. The key is the target name and the value is a boolean
+  that specifies if the test should be run for that target. By default, all targets are enabled as long as they have the required configurations
+  specified in the ``requires`` field. This field is also valid for examples.
 * ``platforms``: A dictionary that specifies the supported platforms. The key is the platform name and the value is a boolean that specifies if
   the platform is supported. By default, all platforms are assumed to be supported.
 * ``extra_tags``: A list of extra tags that the runner will require when running the test suite in hardware. By default, no extra tags are required.

From 66e74eddbcde60b0aeab0def0f9c7fb5a3c129b2 Mon Sep 17 00:00:00 2001
From: Lucas Saavedra Vaz <32426024+lucasssvaz@users.noreply.github.com>
Date: Sat, 28 Sep 2024 11:37:27 -0300
Subject: [PATCH 3/8] fix(json): Ignore comments when searching requirements

---
 .github/scripts/install-platformio-esp32.sh | 4 ++--
 .github/scripts/sketch_utils.sh             | 4 ++--
 .github/scripts/tests_run.sh                | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/scripts/install-platformio-esp32.sh b/.github/scripts/install-platformio-esp32.sh
index 35ac29966b7..7b28c878180 100755
--- a/.github/scripts/install-platformio-esp32.sh
+++ b/.github/scripts/install-platformio-esp32.sh
@@ -100,7 +100,7 @@ function count_sketches(){ # count_sketches <examples-path>
             requirements=$(jq -r '.requires[]? // empty' $sketchdir/ci.json)
             if [[ "$requirements" != "null" ]] || [[ "$requirements" != "" ]]; then
                 for requirement in $requirements; do
-                    found_line=$(grep "$requirement" $LIBS_DIR/esp32/sdkconfig)
+                    found_line=$(grep "^$requirement" $LIBS_DIR/esp32/sdkconfig)
                     if [[ "$found_line" == "" ]]; then
                         continue 2
                     fi
@@ -190,7 +190,7 @@ function build_pio_sketches(){ # build_pio_sketches <board> <options> <examples-
             requirements=$(jq -r '.requires[]? // empty' $sketchdir/ci.json)
             if [[ "$requirements" != "null" ]] || [[ "$requirements" != "" ]]; then
                 for requirement in $requirements; do
-                    found_line=$(grep "$requirement" $LIBS_DIR/esp32/sdkconfig)
+                    found_line=$(grep "^$requirement" $LIBS_DIR/esp32/sdkconfig)
                     if [[ "$found_line" == "" ]]; then
                         continue 2
                     fi
diff --git a/.github/scripts/sketch_utils.sh b/.github/scripts/sketch_utils.sh
index bf2c69b3ccc..549fe84fa54 100755
--- a/.github/scripts/sketch_utils.sh
+++ b/.github/scripts/sketch_utils.sh
@@ -154,7 +154,7 @@ function build_sketch(){ # build_sketch <ide_path> <user_path> <path-to-ino> [ex
         requirements=$(jq -r '.requires[]? // empty' $sketchdir/ci.json)
         if [[ "$requirements" != "null" ]] || [[ "$requirements" != "" ]]; then
             for requirement in $requirements; do
-                found_line=$(grep "$requirement" $LIBS_DIR/$target/sdkconfig)
+                found_line=$(grep "^$requirement" $LIBS_DIR/$target/sdkconfig)
                 if [[ "$found_line" == "" ]]; then
                     echo "Target $target does not meet the requirement $requirement for $sketchname. Skipping."
                     exit 0
@@ -310,7 +310,7 @@ function count_sketches(){ # count_sketches <path> [target] [file]
             requirements=$(jq -r '.requires[]? // empty' $sketchdir/ci.json)
             if [[ "$requirements" != "null" ]] || [[ "$requirements" != "" ]]; then
                 for requirement in $requirements; do
-                    found_line=$(grep "$requirement" $LIBS_DIR/$target/sdkconfig)
+                    found_line=$(grep "^$requirement" $LIBS_DIR/$target/sdkconfig)
                     if [[ "$found_line" == "" ]]; then
                         continue 2
                     fi
diff --git a/.github/scripts/tests_run.sh b/.github/scripts/tests_run.sh
index bdf1f6d1e19..8e6627b0acf 100755
--- a/.github/scripts/tests_run.sh
+++ b/.github/scripts/tests_run.sh
@@ -25,7 +25,7 @@ function run_test() {
         requirements=$(jq -r '.requires[]? // empty' $sketchdir/ci.json)
         if [[ "$requirements" != "null" ]] || [[ "$requirements" != "" ]]; then
             for requirement in $requirements; do
-                found_line=$(grep "$requirement" $LIBS_DIR/$target/sdkconfig)
+                found_line=$(grep "^$requirement" $LIBS_DIR/$target/sdkconfig)
                 if [[ "$found_line" == "" ]]; then
                     printf "\033[93mTarget $target does not meet the requirement $requirement for $sketchname. Skipping.\033[0m\n"
                     printf "\n\n\n"

From 113f24ef0804174b568928c9c647a807e9561448 Mon Sep 17 00:00:00 2001
From: Lucas Saavedra Vaz <32426024+lucasssvaz@users.noreply.github.com>
Date: Sat, 28 Sep 2024 20:35:38 -0300
Subject: [PATCH 4/8] feat(json): Add extended regex support to requires field

---
 .github/scripts/install-platformio-esp32.sh | 4 ++--
 .github/scripts/sketch_utils.sh             | 4 ++--
 .github/scripts/tests_run.sh                | 2 +-
 docs/en/contributing.rst                    | 7 ++++++-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.github/scripts/install-platformio-esp32.sh b/.github/scripts/install-platformio-esp32.sh
index 7b28c878180..393c9f3a7d6 100755
--- a/.github/scripts/install-platformio-esp32.sh
+++ b/.github/scripts/install-platformio-esp32.sh
@@ -100,7 +100,7 @@ function count_sketches(){ # count_sketches <examples-path>
             requirements=$(jq -r '.requires[]? // empty' $sketchdir/ci.json)
             if [[ "$requirements" != "null" ]] || [[ "$requirements" != "" ]]; then
                 for requirement in $requirements; do
-                    found_line=$(grep "^$requirement" $LIBS_DIR/esp32/sdkconfig)
+                    found_line=$(grep -E "^$requirement" $LIBS_DIR/esp32/sdkconfig)
                     if [[ "$found_line" == "" ]]; then
                         continue 2
                     fi
@@ -190,7 +190,7 @@ function build_pio_sketches(){ # build_pio_sketches <board> <options> <examples-
             requirements=$(jq -r '.requires[]? // empty' $sketchdir/ci.json)
             if [[ "$requirements" != "null" ]] || [[ "$requirements" != "" ]]; then
                 for requirement in $requirements; do
-                    found_line=$(grep "^$requirement" $LIBS_DIR/esp32/sdkconfig)
+                    found_line=$(grep -E "^$requirement" $LIBS_DIR/esp32/sdkconfig)
                     if [[ "$found_line" == "" ]]; then
                         continue 2
                     fi
diff --git a/.github/scripts/sketch_utils.sh b/.github/scripts/sketch_utils.sh
index 549fe84fa54..fa1458de6f2 100755
--- a/.github/scripts/sketch_utils.sh
+++ b/.github/scripts/sketch_utils.sh
@@ -154,7 +154,7 @@ function build_sketch(){ # build_sketch <ide_path> <user_path> <path-to-ino> [ex
         requirements=$(jq -r '.requires[]? // empty' $sketchdir/ci.json)
         if [[ "$requirements" != "null" ]] || [[ "$requirements" != "" ]]; then
             for requirement in $requirements; do
-                found_line=$(grep "^$requirement" $LIBS_DIR/$target/sdkconfig)
+                found_line=$(grep -E "^$requirement" $LIBS_DIR/$target/sdkconfig)
                 if [[ "$found_line" == "" ]]; then
                     echo "Target $target does not meet the requirement $requirement for $sketchname. Skipping."
                     exit 0
@@ -310,7 +310,7 @@ function count_sketches(){ # count_sketches <path> [target] [file]
             requirements=$(jq -r '.requires[]? // empty' $sketchdir/ci.json)
             if [[ "$requirements" != "null" ]] || [[ "$requirements" != "" ]]; then
                 for requirement in $requirements; do
-                    found_line=$(grep "^$requirement" $LIBS_DIR/$target/sdkconfig)
+                    found_line=$(grep -E "^$requirement" $LIBS_DIR/$target/sdkconfig)
                     if [[ "$found_line" == "" ]]; then
                         continue 2
                     fi
diff --git a/.github/scripts/tests_run.sh b/.github/scripts/tests_run.sh
index 8e6627b0acf..7f990bea45d 100755
--- a/.github/scripts/tests_run.sh
+++ b/.github/scripts/tests_run.sh
@@ -25,7 +25,7 @@ function run_test() {
         requirements=$(jq -r '.requires[]? // empty' $sketchdir/ci.json)
         if [[ "$requirements" != "null" ]] || [[ "$requirements" != "" ]]; then
             for requirement in $requirements; do
-                found_line=$(grep "^$requirement" $LIBS_DIR/$target/sdkconfig)
+                found_line=$(grep -E "^$requirement" $LIBS_DIR/$target/sdkconfig)
                 if [[ "$found_line" == "" ]]; then
                     printf "\033[93mTarget $target does not meet the requirement $requirement for $sketchname. Skipping.\033[0m\n"
                     printf "\n\n\n"
diff --git a/docs/en/contributing.rst b/docs/en/contributing.rst
index 3eac77aaf65..26272f3d1c3 100644
--- a/docs/en/contributing.rst
+++ b/docs/en/contributing.rst
@@ -110,8 +110,10 @@ Testing
 *******
 
 Be sure you have tested the example in all the supported targets. If the example some specific hardware requirements,
-edit/add the ``ci.json`` in the same folder as the sketch to specify the required configurations from ``sdkconfig``.
+edit/add the ``ci.json`` in the same folder as the sketch to specify the regular expression for the
+required configurations from ``sdkconfig``.
 This will ensure that the CI system will run the test only on the targets that have the required configurations.
+
 You can check the available configurations in the ``sdkconfig`` file in the ``tools/esp32-arduino-libs/<target>`` folder.
 
 Here is an example of the ``ci.json`` file where the example requires Wi-Fi to work properly:
@@ -129,6 +131,9 @@ Here is an example of the ``ci.json`` file where the example requires Wi-Fi to w
     The list of configurations will be checked against the ``sdkconfig`` file in the target folder. If the configuration is not present in the ``sdkconfig``,
     the test will be skipped for that target. That means that the test will only run on the targets that have **ALL** the required configurations.
 
+    Also, by default, the "match start of line" character (``^``) will be added to the beginning of each configuration.
+    That means that the configuration must be at the beginning of the line in the ``sdkconfig`` file.
+
 Sometimes, the example might not be supported by some target, even if the target has the required configurations
 (like resources limitations or requiring a specific SoC). To avoid compilation errors, you can add the target to the ``ci.json``
 file so the CI system will force to skip the test on that target.

From fed17cc6e6258755200dae566ee900e1fb70f4d2 Mon Sep 17 00:00:00 2001
From: Lucas Saavedra Vaz <32426024+lucasssvaz@users.noreply.github.com>
Date: Sat, 28 Sep 2024 20:36:25 -0300
Subject: [PATCH 5/8] change(json): Move to using requirements in JSON

---
 libraries/ArduinoOTA/examples/BasicOTA/ci.json        |  6 +++---
 libraries/AsyncUDP/examples/AsyncUDPClient/ci.json    |  6 +++---
 .../AsyncUDP/examples/AsyncUDPMulticastServer/ci.json |  6 +++---
 libraries/AsyncUDP/examples/AsyncUDPServer/ci.json    |  6 +++---
 libraries/BLE/examples/BLE5_extended_scan/ci.json     |  7 +++----
 libraries/BLE/examples/BLE5_multi_advertising/ci.json |  7 +++----
 .../BLE/examples/BLE5_periodic_advertising/ci.json    |  7 +++----
 libraries/BLE/examples/BLE5_periodic_sync/ci.json     |  7 +++----
 libraries/BLE/examples/Beacon_Scanner/ci.json         |  6 +++---
 libraries/BLE/examples/Client/ci.json                 |  6 +++---
 libraries/BLE/examples/EddystoneTLM_Beacon/ci.json    |  7 +++----
 libraries/BLE/examples/EddystoneURL_Beacon/ci.json    |  7 +++----
 libraries/BLE/examples/Notify/ci.json                 |  6 +++---
 libraries/BLE/examples/Scan/ci.json                   |  6 +++---
 libraries/BLE/examples/Server/ci.json                 |  6 +++---
 libraries/BLE/examples/Server_multiconnect/ci.json    |  6 +++---
 libraries/BLE/examples/UART/ci.json                   |  6 +++---
 libraries/BLE/examples/Write/ci.json                  |  6 +++---
 libraries/BLE/examples/iBeacon/ci.json                |  6 +++---
 .../BluetoothSerial/examples/DiscoverConnect/ci.json  | 10 +++-------
 .../BluetoothSerial/examples/GetLocalMAC/ci.json      | 10 +++-------
 .../BluetoothSerial/examples/SerialToSerialBT/ci.json | 10 +++-------
 .../examples/SerialToSerialBTM/ci.json                | 10 +++-------
 .../examples/SerialToSerialBT_Legacy/ci.json          | 10 +++-------
 .../examples/SerialToSerialBT_SSP/ci.json             | 10 +++-------
 .../examples/bt_classic_device_discovery/ci.json      | 10 +++-------
 .../examples/bt_remove_paired_devices/ci.json         | 10 +++-------
 libraries/DNSServer/examples/CaptivePortal/ci.json    |  6 +++---
 .../ESP32/examples/Camera/CameraWebServer/ci.json     |  8 +++-----
 libraries/ESP32/examples/HWCDC_Events/ci.json         |  7 +++----
 libraries/ESP32/examples/Time/SimpleTime/ci.json      |  6 +++---
 libraries/ESP32/examples/Touch/TouchButton/ci.json    | 10 +++-------
 libraries/ESP32/examples/Touch/TouchButtonV2/ci.json  |  9 +++------
 libraries/ESP32/examples/Touch/TouchInterrupt/ci.json |  8 +++-----
 libraries/ESP32/examples/Touch/TouchRead/ci.json      |  8 +++-----
 libraries/ESP_I2S/examples/ES8388_loopback/ci.json    |  6 ++++++
 libraries/ESP_I2S/examples/Record_to_WAV/ci.json      | 10 ++++------
 libraries/ESP_I2S/examples/Simple_tone/ci.json        |  5 +++++
 .../ESP_NOW/examples/ESP_NOW_Broadcast_Master/ci.json |  6 +++---
 .../ESP_NOW/examples/ESP_NOW_Broadcast_Slave/ci.json  |  6 +++---
 libraries/ESP_NOW/examples/ESP_NOW_Network/ci.json    |  6 +++---
 libraries/ESP_NOW/examples/ESP_NOW_Serial/ci.json     |  6 +++---
 libraries/ESP_SR/examples/Basic/ci.json               |  5 ++++-
 libraries/ESPmDNS/examples/mDNS-SD_Extended/ci.json   |  6 +++---
 libraries/ESPmDNS/examples/mDNS_Web_Server/ci.json    |  6 +++---
 libraries/Ethernet/examples/ETH_LAN8720/ci.json       | 10 +++-------
 libraries/Ethernet/examples/ETH_TLK110/ci.json        | 10 +++-------
 libraries/Ethernet/examples/ETH_WIFI_BRIDGE/ci.json   |  6 +++---
 libraries/FFat/examples/FFat_time/ci.json             |  6 +++---
 libraries/HTTPClient/examples/Authorization/ci.json   |  6 +++---
 libraries/HTTPClient/examples/BasicHttpClient/ci.json |  6 +++---
 .../HTTPClient/examples/BasicHttpsClient/ci.json      |  6 +++---
 .../HTTPClient/examples/HTTPClientEnterprise/ci.json  |  6 +++---
 libraries/HTTPClient/examples/ReuseConnection/ci.json |  6 +++---
 .../HTTPClient/examples/StreamHttpClient/ci.json      |  6 +++---
 libraries/HTTPUpdate/examples/httpUpdate/ci.json      |  6 +++---
 .../HTTPUpdate/examples/httpUpdateSPIFFS/ci.json      |  6 +++---
 .../HTTPUpdate/examples/httpUpdateSecure/ci.json      |  6 +++---
 .../HTTPUpdateServer/examples/WebUpdater/ci.json      |  6 +++---
 .../Insights/examples/DiagnosticsSmokeTest/ci.json    |  8 ++++----
 .../Insights/examples/MinimalDiagnostics/ci.json      |  8 ++++----
 libraries/LittleFS/examples/LITTLEFS_time/ci.json     |  6 +++---
 libraries/NetBIOS/examples/ESP_NBNST/ci.json          |  6 +++---
 .../examples/WiFiClientInsecure/ci.json               |  6 +++---
 .../examples/WiFiClientPSK/ci.json                    |  6 +++---
 .../examples/WiFiClientSecure/ci.json                 |  6 +++---
 .../examples/WiFiClientSecureEnterprise/ci.json       |  6 +++---
 .../examples/WiFiClientSecureProtocolUpgrade/ci.json  |  6 +++---
 .../examples/WiFiClientShowPeerCredentials/ci.json    |  6 +++---
 .../examples/WiFiClientTrustOnFirstUse/ci.json        |  6 +++---
 libraries/OpenThread/examples/COAP/coap_lamp/ci.json  | 11 ++++-------
 .../OpenThread/examples/COAP/coap_switch/ci.json      | 11 ++++-------
 libraries/OpenThread/examples/SimpleCLI/ci.json       | 11 ++++-------
 libraries/OpenThread/examples/SimpleNode/ci.json      | 11 ++++-------
 .../SimpleThreadNetwork/ExtendedRouterNode/ci.json    | 11 ++++-------
 .../examples/SimpleThreadNetwork/LeaderNode/ci.json   | 11 ++++-------
 .../examples/SimpleThreadNetwork/RouterNode/ci.json   | 11 ++++-------
 libraries/OpenThread/examples/ThreadScan/ci.json      | 11 ++++-------
 libraries/OpenThread/examples/onReceive/ci.json       | 11 ++++-------
 libraries/PPP/examples/PPP_Basic/ci.json              |  5 +++++
 libraries/PPP/examples/PPP_WIFI_BRIDGE/ci.json        |  7 ++++---
 libraries/RainMaker/examples/RMakerCustom/ci.json     |  7 ++++---
 .../RainMaker/examples/RMakerCustomAirCooler/ci.json  |  7 ++++---
 .../RainMaker/examples/RMakerSonoffDualR3/ci.json     |  7 ++++---
 libraries/RainMaker/examples/RMakerSwitch/ci.json     |  7 ++++---
 libraries/SD/examples/SD_time/ci.json                 |  6 +++---
 libraries/SD_MMC/examples/SD2USBMSC/ci.json           | 11 ++++-------
 libraries/SD_MMC/examples/SDMMC_Test/ci.json          |  9 +++------
 libraries/SD_MMC/examples/SDMMC_time/ci.json          | 10 ++++------
 libraries/SPI/examples/SPI_Multiple_Buses/ci.json     |  8 +++-----
 libraries/SPIFFS/examples/SPIFFS_time/ci.json         |  6 +++---
 libraries/SimpleBLE/examples/SimpleBleDevice/ci.json  |  8 ++++----
 libraries/USB/examples/CompositeDevice/ci.json        |  9 +++------
 libraries/USB/examples/ConsumerControl/ci.json        |  9 +++------
 libraries/USB/examples/CustomHIDDevice/ci.json        |  9 +++------
 libraries/USB/examples/FirmwareMSC/ci.json            |  9 +++------
 libraries/USB/examples/Gamepad/ci.json                |  9 +++------
 libraries/USB/examples/HIDVendor/ci.json              |  9 +++------
 .../USB/examples/Keyboard/KeyboardLogout/ci.json      |  9 +++------
 .../USB/examples/Keyboard/KeyboardMessage/ci.json     |  9 +++------
 .../USB/examples/Keyboard/KeyboardReprogram/ci.json   |  9 +++------
 .../USB/examples/Keyboard/KeyboardSerial/ci.json      |  9 +++------
 .../USB/examples/KeyboardAndMouseControl/ci.json      |  9 +++------
 libraries/USB/examples/MIDI/MidiController/ci.json    |  9 +++------
 libraries/USB/examples/MIDI/MidiInterface/ci.json     |  9 +++------
 libraries/USB/examples/MIDI/MidiMusicBox/ci.json      |  9 +++------
 libraries/USB/examples/MIDI/ReceiveMidi/ci.json       |  9 +++------
 .../USB/examples/Mouse/ButtonMouseControl/ci.json     |  9 +++------
 libraries/USB/examples/SystemControl/ci.json          |  9 +++------
 libraries/USB/examples/USBMSC/ci.json                 |  9 +++------
 libraries/USB/examples/USBSerial/ci.json              |  9 +++------
 libraries/USB/examples/USBVendor/ci.json              |  9 +++------
 libraries/Update/examples/AWS_S3_OTA_Update/ci.json   |  6 +++---
 libraries/Update/examples/HTTPS_OTA_Update/ci.json    |  6 +++---
 .../examples/HTTP_Client_AES_OTA_Update/ci.json       |  6 +++---
 .../examples/HTTP_Server_AES_OTA_Update/ci.json       |  6 +++---
 libraries/Update/examples/OTAWebUpdater/ci.json       |  6 +++---
 .../WebServer/examples/AdvancedWebServer/ci.json      |  6 +++---
 libraries/WebServer/examples/FSBrowser/ci.json        |  6 +++---
 libraries/WebServer/examples/Filters/ci.json          |  6 +++---
 libraries/WebServer/examples/HelloServer/ci.json      |  6 +++---
 libraries/WebServer/examples/HttpAdvancedAuth/ci.json |  6 +++---
 libraries/WebServer/examples/HttpAuthCallback/ci.json |  6 +++---
 .../WebServer/examples/HttpAuthCallbackInline/ci.json |  6 +++---
 libraries/WebServer/examples/HttpBasicAuth/ci.json    |  6 +++---
 .../WebServer/examples/HttpBasicAuthSHA1/ci.json      |  6 +++---
 .../examples/HttpBasicAuthSHA1orBearerToken/ci.json   |  6 +++---
 .../WebServer/examples/MultiHomedServers/ci.json      |  6 +++---
 libraries/WebServer/examples/PathArgServer/ci.json    |  6 +++---
 libraries/WebServer/examples/SDWebServer/ci.json      |  6 +++---
 .../WebServer/examples/SimpleAuthentification/ci.json |  6 +++---
 libraries/WebServer/examples/UploadHugeFile/ci.json   |  6 +++---
 libraries/WebServer/examples/WebServer/ci.json        |  6 +++---
 libraries/WebServer/examples/WebUpdate/ci.json        |  6 +++---
 libraries/WiFi/examples/FTM/FTM_Initiator/ci.json     |  6 +++---
 libraries/WiFi/examples/FTM/FTM_Responder/ci.json     |  6 +++---
 libraries/WiFi/examples/SimpleWiFiServer/ci.json      |  6 +++---
 libraries/WiFi/examples/WPS/ci.json                   |  6 +++---
 libraries/WiFi/examples/WiFiAccessPoint/ci.json       |  6 +++---
 libraries/WiFi/examples/WiFiBlueToothSwitch/ci.json   |  4 +++-
 libraries/WiFi/examples/WiFiClient/ci.json            |  6 +++---
 libraries/WiFi/examples/WiFiClientBasic/ci.json       |  6 +++---
 libraries/WiFi/examples/WiFiClientConnect/ci.json     |  6 +++---
 libraries/WiFi/examples/WiFiClientEnterprise/ci.json  |  6 +++---
 libraries/WiFi/examples/WiFiClientEvents/ci.json      |  6 +++---
 libraries/WiFi/examples/WiFiClientStaticIP/ci.json    |  6 +++---
 libraries/WiFi/examples/WiFiExtender/ci.json          |  6 +++---
 libraries/WiFi/examples/WiFiIPv6/ci.json              |  6 +++---
 libraries/WiFi/examples/WiFiMulti/ci.json             |  6 +++---
 libraries/WiFi/examples/WiFiMultiAdvanced/ci.json     |  6 +++---
 libraries/WiFi/examples/WiFiScan/ci.json              |  6 +++---
 libraries/WiFi/examples/WiFiScanAsync/ci.json         |  6 +++---
 libraries/WiFi/examples/WiFiScanDualAntenna/ci.json   |  6 +++---
 libraries/WiFi/examples/WiFiScanTime/ci.json          |  6 +++---
 libraries/WiFi/examples/WiFiSmartConfig/ci.json       |  6 +++---
 libraries/WiFi/examples/WiFiTelnetToSerial/ci.json    |  6 +++---
 libraries/WiFi/examples/WiFiUDPClient/ci.json         |  6 +++---
 libraries/WiFiProv/examples/WiFiProv/ci.json          |  6 +++---
 libraries/Wire/examples/WireMaster/ci.json            |  5 +++++
 libraries/Wire/examples/WireScan/ci.json              |  5 +++++
 libraries/Wire/examples/WireSlave/ci.json             |  6 +++---
 tests/validation/democfg/ci.json                      |  3 +++
 tests/validation/touch/ci.json                        |  8 +++-----
 tests/validation/wifi/ci.json                         |  6 +++---
 164 files changed, 524 insertions(+), 646 deletions(-)
 create mode 100644 libraries/ESP_I2S/examples/ES8388_loopback/ci.json
 create mode 100644 libraries/ESP_I2S/examples/Simple_tone/ci.json
 create mode 100644 libraries/PPP/examples/PPP_Basic/ci.json
 create mode 100644 libraries/Wire/examples/WireMaster/ci.json
 create mode 100644 libraries/Wire/examples/WireScan/ci.json

diff --git a/libraries/ArduinoOTA/examples/BasicOTA/ci.json b/libraries/ArduinoOTA/examples/BasicOTA/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/ArduinoOTA/examples/BasicOTA/ci.json
+++ b/libraries/ArduinoOTA/examples/BasicOTA/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/AsyncUDP/examples/AsyncUDPClient/ci.json b/libraries/AsyncUDP/examples/AsyncUDPClient/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/AsyncUDP/examples/AsyncUDPClient/ci.json
+++ b/libraries/AsyncUDP/examples/AsyncUDPClient/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/AsyncUDP/examples/AsyncUDPMulticastServer/ci.json b/libraries/AsyncUDP/examples/AsyncUDPMulticastServer/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/AsyncUDP/examples/AsyncUDPMulticastServer/ci.json
+++ b/libraries/AsyncUDP/examples/AsyncUDPMulticastServer/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/AsyncUDP/examples/AsyncUDPServer/ci.json b/libraries/AsyncUDP/examples/AsyncUDPServer/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/AsyncUDP/examples/AsyncUDPServer/ci.json
+++ b/libraries/AsyncUDP/examples/AsyncUDPServer/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/BLE/examples/BLE5_extended_scan/ci.json b/libraries/BLE/examples/BLE5_extended_scan/ci.json
index edef5051e09..9f7646a74a6 100644
--- a/libraries/BLE/examples/BLE5_extended_scan/ci.json
+++ b/libraries/BLE/examples/BLE5_extended_scan/ci.json
@@ -1,6 +1,5 @@
 {
-  "targets": {
-    "esp32": false,
-    "esp32s2": false
-  }
+  "requires": [
+    "CONFIG_SOC_BLE_50_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/BLE/examples/BLE5_multi_advertising/ci.json b/libraries/BLE/examples/BLE5_multi_advertising/ci.json
index edef5051e09..9f7646a74a6 100644
--- a/libraries/BLE/examples/BLE5_multi_advertising/ci.json
+++ b/libraries/BLE/examples/BLE5_multi_advertising/ci.json
@@ -1,6 +1,5 @@
 {
-  "targets": {
-    "esp32": false,
-    "esp32s2": false
-  }
+  "requires": [
+    "CONFIG_SOC_BLE_50_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/BLE/examples/BLE5_periodic_advertising/ci.json b/libraries/BLE/examples/BLE5_periodic_advertising/ci.json
index edef5051e09..9f7646a74a6 100644
--- a/libraries/BLE/examples/BLE5_periodic_advertising/ci.json
+++ b/libraries/BLE/examples/BLE5_periodic_advertising/ci.json
@@ -1,6 +1,5 @@
 {
-  "targets": {
-    "esp32": false,
-    "esp32s2": false
-  }
+  "requires": [
+    "CONFIG_SOC_BLE_50_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/BLE/examples/BLE5_periodic_sync/ci.json b/libraries/BLE/examples/BLE5_periodic_sync/ci.json
index edef5051e09..9f7646a74a6 100644
--- a/libraries/BLE/examples/BLE5_periodic_sync/ci.json
+++ b/libraries/BLE/examples/BLE5_periodic_sync/ci.json
@@ -1,6 +1,5 @@
 {
-  "targets": {
-    "esp32": false,
-    "esp32s2": false
-  }
+  "requires": [
+    "CONFIG_SOC_BLE_50_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/BLE/examples/Beacon_Scanner/ci.json b/libraries/BLE/examples/Beacon_Scanner/ci.json
index 1443137ab0d..c23553ec084 100644
--- a/libraries/BLE/examples/Beacon_Scanner/ci.json
+++ b/libraries/BLE/examples/Beacon_Scanner/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32s2": false
-  }
+  "requires": [
+    "CONFIG_SOC_BLE_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/BLE/examples/Client/ci.json b/libraries/BLE/examples/Client/ci.json
index 1443137ab0d..c23553ec084 100644
--- a/libraries/BLE/examples/Client/ci.json
+++ b/libraries/BLE/examples/Client/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32s2": false
-  }
+  "requires": [
+    "CONFIG_SOC_BLE_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/BLE/examples/EddystoneTLM_Beacon/ci.json b/libraries/BLE/examples/EddystoneTLM_Beacon/ci.json
index 521ae8f5ff1..c23553ec084 100644
--- a/libraries/BLE/examples/EddystoneTLM_Beacon/ci.json
+++ b/libraries/BLE/examples/EddystoneTLM_Beacon/ci.json
@@ -1,6 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false,
-    "esp32s2": false
-  }
+  "requires": [
+    "CONFIG_SOC_BLE_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/BLE/examples/EddystoneURL_Beacon/ci.json b/libraries/BLE/examples/EddystoneURL_Beacon/ci.json
index 521ae8f5ff1..c23553ec084 100644
--- a/libraries/BLE/examples/EddystoneURL_Beacon/ci.json
+++ b/libraries/BLE/examples/EddystoneURL_Beacon/ci.json
@@ -1,6 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false,
-    "esp32s2": false
-  }
+  "requires": [
+    "CONFIG_SOC_BLE_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/BLE/examples/Notify/ci.json b/libraries/BLE/examples/Notify/ci.json
index 1443137ab0d..c23553ec084 100644
--- a/libraries/BLE/examples/Notify/ci.json
+++ b/libraries/BLE/examples/Notify/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32s2": false
-  }
+  "requires": [
+    "CONFIG_SOC_BLE_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/BLE/examples/Scan/ci.json b/libraries/BLE/examples/Scan/ci.json
index 1443137ab0d..c23553ec084 100644
--- a/libraries/BLE/examples/Scan/ci.json
+++ b/libraries/BLE/examples/Scan/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32s2": false
-  }
+  "requires": [
+    "CONFIG_SOC_BLE_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/BLE/examples/Server/ci.json b/libraries/BLE/examples/Server/ci.json
index 1443137ab0d..c23553ec084 100644
--- a/libraries/BLE/examples/Server/ci.json
+++ b/libraries/BLE/examples/Server/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32s2": false
-  }
+  "requires": [
+    "CONFIG_SOC_BLE_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/BLE/examples/Server_multiconnect/ci.json b/libraries/BLE/examples/Server_multiconnect/ci.json
index 1443137ab0d..c23553ec084 100644
--- a/libraries/BLE/examples/Server_multiconnect/ci.json
+++ b/libraries/BLE/examples/Server_multiconnect/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32s2": false
-  }
+  "requires": [
+    "CONFIG_SOC_BLE_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/BLE/examples/UART/ci.json b/libraries/BLE/examples/UART/ci.json
index 1443137ab0d..c23553ec084 100644
--- a/libraries/BLE/examples/UART/ci.json
+++ b/libraries/BLE/examples/UART/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32s2": false
-  }
+  "requires": [
+    "CONFIG_SOC_BLE_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/BLE/examples/Write/ci.json b/libraries/BLE/examples/Write/ci.json
index 1443137ab0d..c23553ec084 100644
--- a/libraries/BLE/examples/Write/ci.json
+++ b/libraries/BLE/examples/Write/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32s2": false
-  }
+  "requires": [
+    "CONFIG_SOC_BLE_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/BLE/examples/iBeacon/ci.json b/libraries/BLE/examples/iBeacon/ci.json
index 1443137ab0d..c23553ec084 100644
--- a/libraries/BLE/examples/iBeacon/ci.json
+++ b/libraries/BLE/examples/iBeacon/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32s2": false
-  }
+  "requires": [
+    "CONFIG_SOC_BLE_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/BluetoothSerial/examples/DiscoverConnect/ci.json b/libraries/BluetoothSerial/examples/DiscoverConnect/ci.json
index 1af543242e3..98fda4381b1 100644
--- a/libraries/BluetoothSerial/examples/DiscoverConnect/ci.json
+++ b/libraries/BluetoothSerial/examples/DiscoverConnect/ci.json
@@ -1,9 +1,5 @@
 {
-  "targets": {
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false,
-    "esp32s2": false,
-    "esp32s3": false
-  }
+  "requires": [
+    "CONFIG_BT_SPP_ENABLED=y"
+  ]
 }
diff --git a/libraries/BluetoothSerial/examples/GetLocalMAC/ci.json b/libraries/BluetoothSerial/examples/GetLocalMAC/ci.json
index 1af543242e3..98fda4381b1 100644
--- a/libraries/BluetoothSerial/examples/GetLocalMAC/ci.json
+++ b/libraries/BluetoothSerial/examples/GetLocalMAC/ci.json
@@ -1,9 +1,5 @@
 {
-  "targets": {
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false,
-    "esp32s2": false,
-    "esp32s3": false
-  }
+  "requires": [
+    "CONFIG_BT_SPP_ENABLED=y"
+  ]
 }
diff --git a/libraries/BluetoothSerial/examples/SerialToSerialBT/ci.json b/libraries/BluetoothSerial/examples/SerialToSerialBT/ci.json
index 1af543242e3..98fda4381b1 100644
--- a/libraries/BluetoothSerial/examples/SerialToSerialBT/ci.json
+++ b/libraries/BluetoothSerial/examples/SerialToSerialBT/ci.json
@@ -1,9 +1,5 @@
 {
-  "targets": {
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false,
-    "esp32s2": false,
-    "esp32s3": false
-  }
+  "requires": [
+    "CONFIG_BT_SPP_ENABLED=y"
+  ]
 }
diff --git a/libraries/BluetoothSerial/examples/SerialToSerialBTM/ci.json b/libraries/BluetoothSerial/examples/SerialToSerialBTM/ci.json
index 1af543242e3..98fda4381b1 100644
--- a/libraries/BluetoothSerial/examples/SerialToSerialBTM/ci.json
+++ b/libraries/BluetoothSerial/examples/SerialToSerialBTM/ci.json
@@ -1,9 +1,5 @@
 {
-  "targets": {
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false,
-    "esp32s2": false,
-    "esp32s3": false
-  }
+  "requires": [
+    "CONFIG_BT_SPP_ENABLED=y"
+  ]
 }
diff --git a/libraries/BluetoothSerial/examples/SerialToSerialBT_Legacy/ci.json b/libraries/BluetoothSerial/examples/SerialToSerialBT_Legacy/ci.json
index 1af543242e3..98fda4381b1 100644
--- a/libraries/BluetoothSerial/examples/SerialToSerialBT_Legacy/ci.json
+++ b/libraries/BluetoothSerial/examples/SerialToSerialBT_Legacy/ci.json
@@ -1,9 +1,5 @@
 {
-  "targets": {
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false,
-    "esp32s2": false,
-    "esp32s3": false
-  }
+  "requires": [
+    "CONFIG_BT_SPP_ENABLED=y"
+  ]
 }
diff --git a/libraries/BluetoothSerial/examples/SerialToSerialBT_SSP/ci.json b/libraries/BluetoothSerial/examples/SerialToSerialBT_SSP/ci.json
index 1af543242e3..98fda4381b1 100644
--- a/libraries/BluetoothSerial/examples/SerialToSerialBT_SSP/ci.json
+++ b/libraries/BluetoothSerial/examples/SerialToSerialBT_SSP/ci.json
@@ -1,9 +1,5 @@
 {
-  "targets": {
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false,
-    "esp32s2": false,
-    "esp32s3": false
-  }
+  "requires": [
+    "CONFIG_BT_SPP_ENABLED=y"
+  ]
 }
diff --git a/libraries/BluetoothSerial/examples/bt_classic_device_discovery/ci.json b/libraries/BluetoothSerial/examples/bt_classic_device_discovery/ci.json
index 1af543242e3..98fda4381b1 100644
--- a/libraries/BluetoothSerial/examples/bt_classic_device_discovery/ci.json
+++ b/libraries/BluetoothSerial/examples/bt_classic_device_discovery/ci.json
@@ -1,9 +1,5 @@
 {
-  "targets": {
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false,
-    "esp32s2": false,
-    "esp32s3": false
-  }
+  "requires": [
+    "CONFIG_BT_SPP_ENABLED=y"
+  ]
 }
diff --git a/libraries/BluetoothSerial/examples/bt_remove_paired_devices/ci.json b/libraries/BluetoothSerial/examples/bt_remove_paired_devices/ci.json
index 1af543242e3..98fda4381b1 100644
--- a/libraries/BluetoothSerial/examples/bt_remove_paired_devices/ci.json
+++ b/libraries/BluetoothSerial/examples/bt_remove_paired_devices/ci.json
@@ -1,9 +1,5 @@
 {
-  "targets": {
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false,
-    "esp32s2": false,
-    "esp32s3": false
-  }
+  "requires": [
+    "CONFIG_BT_SPP_ENABLED=y"
+  ]
 }
diff --git a/libraries/DNSServer/examples/CaptivePortal/ci.json b/libraries/DNSServer/examples/CaptivePortal/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/DNSServer/examples/CaptivePortal/ci.json
+++ b/libraries/DNSServer/examples/CaptivePortal/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/ESP32/examples/Camera/CameraWebServer/ci.json b/libraries/ESP32/examples/Camera/CameraWebServer/ci.json
index 25c42144223..7e0f3c89986 100644
--- a/libraries/ESP32/examples/Camera/CameraWebServer/ci.json
+++ b/libraries/ESP32/examples/Camera/CameraWebServer/ci.json
@@ -1,7 +1,5 @@
 {
-  "targets": {
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_CAMERA_TASK_STACK_SIZE=[0-9]+"
+  ]
 }
diff --git a/libraries/ESP32/examples/HWCDC_Events/ci.json b/libraries/ESP32/examples/HWCDC_Events/ci.json
index d6c4351c868..56e38bbcdf2 100644
--- a/libraries/ESP32/examples/HWCDC_Events/ci.json
+++ b/libraries/ESP32/examples/HWCDC_Events/ci.json
@@ -4,8 +4,7 @@
       "espressif:esp32:esp32s3:USBMode=hwcdc,PartitionScheme=huge_app,FlashMode=dio"
     ]
   },
-  "targets": {
-    "esp32": false,
-    "esp32s2": false
-  }
+  "requires": [
+    "CONFIG_SOC_USB_SERIAL_JTAG_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/ESP32/examples/Time/SimpleTime/ci.json b/libraries/ESP32/examples/Time/SimpleTime/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/ESP32/examples/Time/SimpleTime/ci.json
+++ b/libraries/ESP32/examples/Time/SimpleTime/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/ESP32/examples/Touch/TouchButton/ci.json b/libraries/ESP32/examples/Touch/TouchButton/ci.json
index 1af543242e3..c0ecf9fc0a5 100644
--- a/libraries/ESP32/examples/Touch/TouchButton/ci.json
+++ b/libraries/ESP32/examples/Touch/TouchButton/ci.json
@@ -1,9 +1,5 @@
 {
-  "targets": {
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false,
-    "esp32s2": false,
-    "esp32s3": false
-  }
+  "requires": [
+    "CONFIG_SOC_TOUCH_SENSOR_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/ESP32/examples/Touch/TouchButtonV2/ci.json b/libraries/ESP32/examples/Touch/TouchButtonV2/ci.json
index e7d65393dd6..c0ecf9fc0a5 100644
--- a/libraries/ESP32/examples/Touch/TouchButtonV2/ci.json
+++ b/libraries/ESP32/examples/Touch/TouchButtonV2/ci.json
@@ -1,8 +1,5 @@
 {
-  "targets": {
-    "esp32": false,
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_TOUCH_SENSOR_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/ESP32/examples/Touch/TouchInterrupt/ci.json b/libraries/ESP32/examples/Touch/TouchInterrupt/ci.json
index 25c42144223..c0ecf9fc0a5 100644
--- a/libraries/ESP32/examples/Touch/TouchInterrupt/ci.json
+++ b/libraries/ESP32/examples/Touch/TouchInterrupt/ci.json
@@ -1,7 +1,5 @@
 {
-  "targets": {
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_TOUCH_SENSOR_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/ESP32/examples/Touch/TouchRead/ci.json b/libraries/ESP32/examples/Touch/TouchRead/ci.json
index 25c42144223..c0ecf9fc0a5 100644
--- a/libraries/ESP32/examples/Touch/TouchRead/ci.json
+++ b/libraries/ESP32/examples/Touch/TouchRead/ci.json
@@ -1,7 +1,5 @@
 {
-  "targets": {
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_TOUCH_SENSOR_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/ESP_I2S/examples/ES8388_loopback/ci.json b/libraries/ESP_I2S/examples/ES8388_loopback/ci.json
new file mode 100644
index 00000000000..e0f64e28943
--- /dev/null
+++ b/libraries/ESP_I2S/examples/ES8388_loopback/ci.json
@@ -0,0 +1,6 @@
+{
+  "requires": [
+    "CONFIG_SOC_I2S_SUPPORTED=y",
+    "CONFIG_SOC_I2C_SUPPORTED=y"
+  ]
+}
diff --git a/libraries/ESP_I2S/examples/Record_to_WAV/ci.json b/libraries/ESP_I2S/examples/Record_to_WAV/ci.json
index 35b6e255471..a45dc2f0120 100644
--- a/libraries/ESP_I2S/examples/Record_to_WAV/ci.json
+++ b/libraries/ESP_I2S/examples/Record_to_WAV/ci.json
@@ -1,8 +1,6 @@
 {
-  "targets": {
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false,
-    "esp32s2": false
-  }
+  "requires": [
+    "CONFIG_SOC_SDMMC_HOST_SUPPORTED=y",
+    "CONFIG_SOC_I2S_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/ESP_I2S/examples/Simple_tone/ci.json b/libraries/ESP_I2S/examples/Simple_tone/ci.json
new file mode 100644
index 00000000000..9842f2f9b2a
--- /dev/null
+++ b/libraries/ESP_I2S/examples/Simple_tone/ci.json
@@ -0,0 +1,5 @@
+{
+  "requires": [
+    "CONFIG_SOC_I2S_SUPPORTED=y"
+  ]
+}
diff --git a/libraries/ESP_NOW/examples/ESP_NOW_Broadcast_Master/ci.json b/libraries/ESP_NOW/examples/ESP_NOW_Broadcast_Master/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/ESP_NOW/examples/ESP_NOW_Broadcast_Master/ci.json
+++ b/libraries/ESP_NOW/examples/ESP_NOW_Broadcast_Master/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/ESP_NOW/examples/ESP_NOW_Broadcast_Slave/ci.json b/libraries/ESP_NOW/examples/ESP_NOW_Broadcast_Slave/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/ESP_NOW/examples/ESP_NOW_Broadcast_Slave/ci.json
+++ b/libraries/ESP_NOW/examples/ESP_NOW_Broadcast_Slave/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/ESP_NOW/examples/ESP_NOW_Network/ci.json b/libraries/ESP_NOW/examples/ESP_NOW_Network/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/ESP_NOW/examples/ESP_NOW_Network/ci.json
+++ b/libraries/ESP_NOW/examples/ESP_NOW_Network/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/ESP_NOW/examples/ESP_NOW_Serial/ci.json b/libraries/ESP_NOW/examples/ESP_NOW_Serial/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/ESP_NOW/examples/ESP_NOW_Serial/ci.json
+++ b/libraries/ESP_NOW/examples/ESP_NOW_Serial/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/ESP_SR/examples/Basic/ci.json b/libraries/ESP_SR/examples/Basic/ci.json
index dca52699ab3..4b3465ad836 100644
--- a/libraries/ESP_SR/examples/Basic/ci.json
+++ b/libraries/ESP_SR/examples/Basic/ci.json
@@ -10,5 +10,8 @@
     "esp32c6": false,
     "esp32h2": false,
     "esp32s2": false
-  }
+  },
+  "requires": [
+    "CONFIG_SOC_I2S_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/ESPmDNS/examples/mDNS-SD_Extended/ci.json b/libraries/ESPmDNS/examples/mDNS-SD_Extended/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/ESPmDNS/examples/mDNS-SD_Extended/ci.json
+++ b/libraries/ESPmDNS/examples/mDNS-SD_Extended/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/ESPmDNS/examples/mDNS_Web_Server/ci.json b/libraries/ESPmDNS/examples/mDNS_Web_Server/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/ESPmDNS/examples/mDNS_Web_Server/ci.json
+++ b/libraries/ESPmDNS/examples/mDNS_Web_Server/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/Ethernet/examples/ETH_LAN8720/ci.json b/libraries/Ethernet/examples/ETH_LAN8720/ci.json
index 1af543242e3..dcdfd06db51 100644
--- a/libraries/Ethernet/examples/ETH_LAN8720/ci.json
+++ b/libraries/Ethernet/examples/ETH_LAN8720/ci.json
@@ -1,9 +1,5 @@
 {
-  "targets": {
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false,
-    "esp32s2": false,
-    "esp32s3": false
-  }
+  "requires": [
+    "CONFIG_ETH_USE_ESP32_EMAC=y"
+  ]
 }
diff --git a/libraries/Ethernet/examples/ETH_TLK110/ci.json b/libraries/Ethernet/examples/ETH_TLK110/ci.json
index 1af543242e3..dcdfd06db51 100644
--- a/libraries/Ethernet/examples/ETH_TLK110/ci.json
+++ b/libraries/Ethernet/examples/ETH_TLK110/ci.json
@@ -1,9 +1,5 @@
 {
-  "targets": {
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false,
-    "esp32s2": false,
-    "esp32s3": false
-  }
+  "requires": [
+    "CONFIG_ETH_USE_ESP32_EMAC=y"
+  ]
 }
diff --git a/libraries/Ethernet/examples/ETH_WIFI_BRIDGE/ci.json b/libraries/Ethernet/examples/ETH_WIFI_BRIDGE/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/Ethernet/examples/ETH_WIFI_BRIDGE/ci.json
+++ b/libraries/Ethernet/examples/ETH_WIFI_BRIDGE/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/FFat/examples/FFat_time/ci.json b/libraries/FFat/examples/FFat_time/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/FFat/examples/FFat_time/ci.json
+++ b/libraries/FFat/examples/FFat_time/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/HTTPClient/examples/Authorization/ci.json b/libraries/HTTPClient/examples/Authorization/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/HTTPClient/examples/Authorization/ci.json
+++ b/libraries/HTTPClient/examples/Authorization/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/HTTPClient/examples/BasicHttpClient/ci.json b/libraries/HTTPClient/examples/BasicHttpClient/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/HTTPClient/examples/BasicHttpClient/ci.json
+++ b/libraries/HTTPClient/examples/BasicHttpClient/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/HTTPClient/examples/BasicHttpsClient/ci.json b/libraries/HTTPClient/examples/BasicHttpsClient/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/HTTPClient/examples/BasicHttpsClient/ci.json
+++ b/libraries/HTTPClient/examples/BasicHttpsClient/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/HTTPClient/examples/HTTPClientEnterprise/ci.json b/libraries/HTTPClient/examples/HTTPClientEnterprise/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/HTTPClient/examples/HTTPClientEnterprise/ci.json
+++ b/libraries/HTTPClient/examples/HTTPClientEnterprise/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/HTTPClient/examples/ReuseConnection/ci.json b/libraries/HTTPClient/examples/ReuseConnection/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/HTTPClient/examples/ReuseConnection/ci.json
+++ b/libraries/HTTPClient/examples/ReuseConnection/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/HTTPClient/examples/StreamHttpClient/ci.json b/libraries/HTTPClient/examples/StreamHttpClient/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/HTTPClient/examples/StreamHttpClient/ci.json
+++ b/libraries/HTTPClient/examples/StreamHttpClient/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/HTTPUpdate/examples/httpUpdate/ci.json b/libraries/HTTPUpdate/examples/httpUpdate/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/HTTPUpdate/examples/httpUpdate/ci.json
+++ b/libraries/HTTPUpdate/examples/httpUpdate/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/HTTPUpdate/examples/httpUpdateSPIFFS/ci.json b/libraries/HTTPUpdate/examples/httpUpdateSPIFFS/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/HTTPUpdate/examples/httpUpdateSPIFFS/ci.json
+++ b/libraries/HTTPUpdate/examples/httpUpdateSPIFFS/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/HTTPUpdate/examples/httpUpdateSecure/ci.json b/libraries/HTTPUpdate/examples/httpUpdateSecure/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/HTTPUpdate/examples/httpUpdateSecure/ci.json
+++ b/libraries/HTTPUpdate/examples/httpUpdateSecure/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/HTTPUpdateServer/examples/WebUpdater/ci.json b/libraries/HTTPUpdateServer/examples/WebUpdater/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/HTTPUpdateServer/examples/WebUpdater/ci.json
+++ b/libraries/HTTPUpdateServer/examples/WebUpdater/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/Insights/examples/DiagnosticsSmokeTest/ci.json b/libraries/Insights/examples/DiagnosticsSmokeTest/ci.json
index 90f5ecfe4d2..fd3a9295b01 100644
--- a/libraries/Insights/examples/DiagnosticsSmokeTest/ci.json
+++ b/libraries/Insights/examples/DiagnosticsSmokeTest/ci.json
@@ -1,6 +1,6 @@
 {
-  "targets": {
-    "esp32c6": false,
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_ESP_INSIGHTS_ENABLED=y",
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/Insights/examples/MinimalDiagnostics/ci.json b/libraries/Insights/examples/MinimalDiagnostics/ci.json
index 90f5ecfe4d2..fd3a9295b01 100644
--- a/libraries/Insights/examples/MinimalDiagnostics/ci.json
+++ b/libraries/Insights/examples/MinimalDiagnostics/ci.json
@@ -1,6 +1,6 @@
 {
-  "targets": {
-    "esp32c6": false,
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_ESP_INSIGHTS_ENABLED=y",
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/LittleFS/examples/LITTLEFS_time/ci.json b/libraries/LittleFS/examples/LITTLEFS_time/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/LittleFS/examples/LITTLEFS_time/ci.json
+++ b/libraries/LittleFS/examples/LITTLEFS_time/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/NetBIOS/examples/ESP_NBNST/ci.json b/libraries/NetBIOS/examples/ESP_NBNST/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/NetBIOS/examples/ESP_NBNST/ci.json
+++ b/libraries/NetBIOS/examples/ESP_NBNST/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/NetworkClientSecure/examples/WiFiClientInsecure/ci.json b/libraries/NetworkClientSecure/examples/WiFiClientInsecure/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/NetworkClientSecure/examples/WiFiClientInsecure/ci.json
+++ b/libraries/NetworkClientSecure/examples/WiFiClientInsecure/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/NetworkClientSecure/examples/WiFiClientPSK/ci.json b/libraries/NetworkClientSecure/examples/WiFiClientPSK/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/NetworkClientSecure/examples/WiFiClientPSK/ci.json
+++ b/libraries/NetworkClientSecure/examples/WiFiClientPSK/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/NetworkClientSecure/examples/WiFiClientSecure/ci.json b/libraries/NetworkClientSecure/examples/WiFiClientSecure/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/NetworkClientSecure/examples/WiFiClientSecure/ci.json
+++ b/libraries/NetworkClientSecure/examples/WiFiClientSecure/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/NetworkClientSecure/examples/WiFiClientSecureEnterprise/ci.json b/libraries/NetworkClientSecure/examples/WiFiClientSecureEnterprise/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/NetworkClientSecure/examples/WiFiClientSecureEnterprise/ci.json
+++ b/libraries/NetworkClientSecure/examples/WiFiClientSecureEnterprise/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/NetworkClientSecure/examples/WiFiClientSecureProtocolUpgrade/ci.json b/libraries/NetworkClientSecure/examples/WiFiClientSecureProtocolUpgrade/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/NetworkClientSecure/examples/WiFiClientSecureProtocolUpgrade/ci.json
+++ b/libraries/NetworkClientSecure/examples/WiFiClientSecureProtocolUpgrade/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/NetworkClientSecure/examples/WiFiClientShowPeerCredentials/ci.json b/libraries/NetworkClientSecure/examples/WiFiClientShowPeerCredentials/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/NetworkClientSecure/examples/WiFiClientShowPeerCredentials/ci.json
+++ b/libraries/NetworkClientSecure/examples/WiFiClientShowPeerCredentials/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/NetworkClientSecure/examples/WiFiClientTrustOnFirstUse/ci.json b/libraries/NetworkClientSecure/examples/WiFiClientTrustOnFirstUse/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/NetworkClientSecure/examples/WiFiClientTrustOnFirstUse/ci.json
+++ b/libraries/NetworkClientSecure/examples/WiFiClientTrustOnFirstUse/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/OpenThread/examples/COAP/coap_lamp/ci.json b/libraries/OpenThread/examples/COAP/coap_lamp/ci.json
index c60d9179992..2ee6af3490e 100644
--- a/libraries/OpenThread/examples/COAP/coap_lamp/ci.json
+++ b/libraries/OpenThread/examples/COAP/coap_lamp/ci.json
@@ -1,9 +1,6 @@
 {
-  "targets": {
-    "esp32": false,
-    "esp32c2": false,
-    "esp32c3": false,
-    "esp32s2": false,
-    "esp32s3": false
-  }
+  "requires": [
+    "CONFIG_OPENTHREAD_ENABLED=y",
+    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/OpenThread/examples/COAP/coap_switch/ci.json b/libraries/OpenThread/examples/COAP/coap_switch/ci.json
index c60d9179992..2ee6af3490e 100644
--- a/libraries/OpenThread/examples/COAP/coap_switch/ci.json
+++ b/libraries/OpenThread/examples/COAP/coap_switch/ci.json
@@ -1,9 +1,6 @@
 {
-  "targets": {
-    "esp32": false,
-    "esp32c2": false,
-    "esp32c3": false,
-    "esp32s2": false,
-    "esp32s3": false
-  }
+  "requires": [
+    "CONFIG_OPENTHREAD_ENABLED=y",
+    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/OpenThread/examples/SimpleCLI/ci.json b/libraries/OpenThread/examples/SimpleCLI/ci.json
index c60d9179992..2ee6af3490e 100644
--- a/libraries/OpenThread/examples/SimpleCLI/ci.json
+++ b/libraries/OpenThread/examples/SimpleCLI/ci.json
@@ -1,9 +1,6 @@
 {
-  "targets": {
-    "esp32": false,
-    "esp32c2": false,
-    "esp32c3": false,
-    "esp32s2": false,
-    "esp32s3": false
-  }
+  "requires": [
+    "CONFIG_OPENTHREAD_ENABLED=y",
+    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/OpenThread/examples/SimpleNode/ci.json b/libraries/OpenThread/examples/SimpleNode/ci.json
index c60d9179992..2ee6af3490e 100644
--- a/libraries/OpenThread/examples/SimpleNode/ci.json
+++ b/libraries/OpenThread/examples/SimpleNode/ci.json
@@ -1,9 +1,6 @@
 {
-  "targets": {
-    "esp32": false,
-    "esp32c2": false,
-    "esp32c3": false,
-    "esp32s2": false,
-    "esp32s3": false
-  }
+  "requires": [
+    "CONFIG_OPENTHREAD_ENABLED=y",
+    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/OpenThread/examples/SimpleThreadNetwork/ExtendedRouterNode/ci.json b/libraries/OpenThread/examples/SimpleThreadNetwork/ExtendedRouterNode/ci.json
index c60d9179992..2ee6af3490e 100644
--- a/libraries/OpenThread/examples/SimpleThreadNetwork/ExtendedRouterNode/ci.json
+++ b/libraries/OpenThread/examples/SimpleThreadNetwork/ExtendedRouterNode/ci.json
@@ -1,9 +1,6 @@
 {
-  "targets": {
-    "esp32": false,
-    "esp32c2": false,
-    "esp32c3": false,
-    "esp32s2": false,
-    "esp32s3": false
-  }
+  "requires": [
+    "CONFIG_OPENTHREAD_ENABLED=y",
+    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/OpenThread/examples/SimpleThreadNetwork/LeaderNode/ci.json b/libraries/OpenThread/examples/SimpleThreadNetwork/LeaderNode/ci.json
index c60d9179992..2ee6af3490e 100644
--- a/libraries/OpenThread/examples/SimpleThreadNetwork/LeaderNode/ci.json
+++ b/libraries/OpenThread/examples/SimpleThreadNetwork/LeaderNode/ci.json
@@ -1,9 +1,6 @@
 {
-  "targets": {
-    "esp32": false,
-    "esp32c2": false,
-    "esp32c3": false,
-    "esp32s2": false,
-    "esp32s3": false
-  }
+  "requires": [
+    "CONFIG_OPENTHREAD_ENABLED=y",
+    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/OpenThread/examples/SimpleThreadNetwork/RouterNode/ci.json b/libraries/OpenThread/examples/SimpleThreadNetwork/RouterNode/ci.json
index c60d9179992..2ee6af3490e 100644
--- a/libraries/OpenThread/examples/SimpleThreadNetwork/RouterNode/ci.json
+++ b/libraries/OpenThread/examples/SimpleThreadNetwork/RouterNode/ci.json
@@ -1,9 +1,6 @@
 {
-  "targets": {
-    "esp32": false,
-    "esp32c2": false,
-    "esp32c3": false,
-    "esp32s2": false,
-    "esp32s3": false
-  }
+  "requires": [
+    "CONFIG_OPENTHREAD_ENABLED=y",
+    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/OpenThread/examples/ThreadScan/ci.json b/libraries/OpenThread/examples/ThreadScan/ci.json
index c60d9179992..2ee6af3490e 100644
--- a/libraries/OpenThread/examples/ThreadScan/ci.json
+++ b/libraries/OpenThread/examples/ThreadScan/ci.json
@@ -1,9 +1,6 @@
 {
-  "targets": {
-    "esp32": false,
-    "esp32c2": false,
-    "esp32c3": false,
-    "esp32s2": false,
-    "esp32s3": false
-  }
+  "requires": [
+    "CONFIG_OPENTHREAD_ENABLED=y",
+    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/OpenThread/examples/onReceive/ci.json b/libraries/OpenThread/examples/onReceive/ci.json
index c60d9179992..2ee6af3490e 100644
--- a/libraries/OpenThread/examples/onReceive/ci.json
+++ b/libraries/OpenThread/examples/onReceive/ci.json
@@ -1,9 +1,6 @@
 {
-  "targets": {
-    "esp32": false,
-    "esp32c2": false,
-    "esp32c3": false,
-    "esp32s2": false,
-    "esp32s3": false
-  }
+  "requires": [
+    "CONFIG_OPENTHREAD_ENABLED=y",
+    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/PPP/examples/PPP_Basic/ci.json b/libraries/PPP/examples/PPP_Basic/ci.json
new file mode 100644
index 00000000000..314587edcf6
--- /dev/null
+++ b/libraries/PPP/examples/PPP_Basic/ci.json
@@ -0,0 +1,5 @@
+{
+  "requires": [
+    "CONFIG_LWIP_PPP_SUPPORT=y"
+  ]
+}
diff --git a/libraries/PPP/examples/PPP_WIFI_BRIDGE/ci.json b/libraries/PPP/examples/PPP_WIFI_BRIDGE/ci.json
index d8b3664bc65..513ab9a296a 100644
--- a/libraries/PPP/examples/PPP_WIFI_BRIDGE/ci.json
+++ b/libraries/PPP/examples/PPP_WIFI_BRIDGE/ci.json
@@ -1,5 +1,6 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_LWIP_PPP_SUPPORT=y",
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/RainMaker/examples/RMakerCustom/ci.json b/libraries/RainMaker/examples/RMakerCustom/ci.json
index d8b3664bc65..de4e92436d7 100644
--- a/libraries/RainMaker/examples/RMakerCustom/ci.json
+++ b/libraries/RainMaker/examples/RMakerCustom/ci.json
@@ -1,5 +1,6 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y",
+    "CONFIG_ESP_RMAKER_WORK_QUEUE_TASK_STACK"
+  ]
 }
diff --git a/libraries/RainMaker/examples/RMakerCustomAirCooler/ci.json b/libraries/RainMaker/examples/RMakerCustomAirCooler/ci.json
index d8b3664bc65..de4e92436d7 100644
--- a/libraries/RainMaker/examples/RMakerCustomAirCooler/ci.json
+++ b/libraries/RainMaker/examples/RMakerCustomAirCooler/ci.json
@@ -1,5 +1,6 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y",
+    "CONFIG_ESP_RMAKER_WORK_QUEUE_TASK_STACK"
+  ]
 }
diff --git a/libraries/RainMaker/examples/RMakerSonoffDualR3/ci.json b/libraries/RainMaker/examples/RMakerSonoffDualR3/ci.json
index d8b3664bc65..de4e92436d7 100644
--- a/libraries/RainMaker/examples/RMakerSonoffDualR3/ci.json
+++ b/libraries/RainMaker/examples/RMakerSonoffDualR3/ci.json
@@ -1,5 +1,6 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y",
+    "CONFIG_ESP_RMAKER_WORK_QUEUE_TASK_STACK"
+  ]
 }
diff --git a/libraries/RainMaker/examples/RMakerSwitch/ci.json b/libraries/RainMaker/examples/RMakerSwitch/ci.json
index d8b3664bc65..de4e92436d7 100644
--- a/libraries/RainMaker/examples/RMakerSwitch/ci.json
+++ b/libraries/RainMaker/examples/RMakerSwitch/ci.json
@@ -1,5 +1,6 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y",
+    "CONFIG_ESP_RMAKER_WORK_QUEUE_TASK_STACK"
+  ]
 }
diff --git a/libraries/SD/examples/SD_time/ci.json b/libraries/SD/examples/SD_time/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/SD/examples/SD_time/ci.json
+++ b/libraries/SD/examples/SD_time/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/SD_MMC/examples/SD2USBMSC/ci.json b/libraries/SD_MMC/examples/SD2USBMSC/ci.json
index 97ae5ee5616..125eed2e476 100644
--- a/libraries/SD_MMC/examples/SD2USBMSC/ci.json
+++ b/libraries/SD_MMC/examples/SD2USBMSC/ci.json
@@ -1,9 +1,6 @@
 {
-  "targets": {
-    "esp32": false,
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false,
-    "esp32s2": false
-  }
+  "requires": [
+    "CONFIG_SOC_SDMMC_HOST_SUPPORTED=y",
+    "CONFIG_TINYUSB_MSC_ENABLED=y"
+  ]
 }
diff --git a/libraries/SD_MMC/examples/SDMMC_Test/ci.json b/libraries/SD_MMC/examples/SDMMC_Test/ci.json
index 35b6e255471..a5221dae538 100644
--- a/libraries/SD_MMC/examples/SDMMC_Test/ci.json
+++ b/libraries/SD_MMC/examples/SDMMC_Test/ci.json
@@ -1,8 +1,5 @@
 {
-  "targets": {
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false,
-    "esp32s2": false
-  }
+  "requires": [
+    "CONFIG_SOC_SDMMC_HOST_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/SD_MMC/examples/SDMMC_time/ci.json b/libraries/SD_MMC/examples/SDMMC_time/ci.json
index 35b6e255471..bd4aac1d647 100644
--- a/libraries/SD_MMC/examples/SDMMC_time/ci.json
+++ b/libraries/SD_MMC/examples/SDMMC_time/ci.json
@@ -1,8 +1,6 @@
 {
-  "targets": {
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false,
-    "esp32s2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y",
+    "CONFIG_SOC_SDMMC_HOST_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/SPI/examples/SPI_Multiple_Buses/ci.json b/libraries/SPI/examples/SPI_Multiple_Buses/ci.json
index 25c42144223..857d589531d 100644
--- a/libraries/SPI/examples/SPI_Multiple_Buses/ci.json
+++ b/libraries/SPI/examples/SPI_Multiple_Buses/ci.json
@@ -1,7 +1,5 @@
 {
-  "targets": {
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_SPI_PERIPH_NUM=[2-9]|CONFIG_SOC_SPI_PERIPH_NUM=[1-9][0-9]+"
+  ]
 }
diff --git a/libraries/SPIFFS/examples/SPIFFS_time/ci.json b/libraries/SPIFFS/examples/SPIFFS_time/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/SPIFFS/examples/SPIFFS_time/ci.json
+++ b/libraries/SPIFFS/examples/SPIFFS_time/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/SimpleBLE/examples/SimpleBleDevice/ci.json b/libraries/SimpleBLE/examples/SimpleBleDevice/ci.json
index a571a89a877..d33a23f332e 100644
--- a/libraries/SimpleBLE/examples/SimpleBleDevice/ci.json
+++ b/libraries/SimpleBLE/examples/SimpleBleDevice/ci.json
@@ -1,6 +1,6 @@
 {
-  "targets": {
-    "esp32c3": false,
-    "esp32s2": false
-  }
+  "requires": [
+    "CONFIG_BT_ENABLED=y",
+    "CONFIG_BLUEDROID_ENABLED=y"
+  ]
 }
diff --git a/libraries/USB/examples/CompositeDevice/ci.json b/libraries/USB/examples/CompositeDevice/ci.json
index e7d65393dd6..f9ac7d0bec9 100644
--- a/libraries/USB/examples/CompositeDevice/ci.json
+++ b/libraries/USB/examples/CompositeDevice/ci.json
@@ -1,8 +1,5 @@
 {
-  "targets": {
-    "esp32": false,
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_USB_OTG_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/USB/examples/ConsumerControl/ci.json b/libraries/USB/examples/ConsumerControl/ci.json
index e7d65393dd6..f9ac7d0bec9 100644
--- a/libraries/USB/examples/ConsumerControl/ci.json
+++ b/libraries/USB/examples/ConsumerControl/ci.json
@@ -1,8 +1,5 @@
 {
-  "targets": {
-    "esp32": false,
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_USB_OTG_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/USB/examples/CustomHIDDevice/ci.json b/libraries/USB/examples/CustomHIDDevice/ci.json
index e7d65393dd6..f9ac7d0bec9 100644
--- a/libraries/USB/examples/CustomHIDDevice/ci.json
+++ b/libraries/USB/examples/CustomHIDDevice/ci.json
@@ -1,8 +1,5 @@
 {
-  "targets": {
-    "esp32": false,
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_USB_OTG_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/USB/examples/FirmwareMSC/ci.json b/libraries/USB/examples/FirmwareMSC/ci.json
index e7d65393dd6..f9ac7d0bec9 100644
--- a/libraries/USB/examples/FirmwareMSC/ci.json
+++ b/libraries/USB/examples/FirmwareMSC/ci.json
@@ -1,8 +1,5 @@
 {
-  "targets": {
-    "esp32": false,
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_USB_OTG_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/USB/examples/Gamepad/ci.json b/libraries/USB/examples/Gamepad/ci.json
index e7d65393dd6..f9ac7d0bec9 100644
--- a/libraries/USB/examples/Gamepad/ci.json
+++ b/libraries/USB/examples/Gamepad/ci.json
@@ -1,8 +1,5 @@
 {
-  "targets": {
-    "esp32": false,
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_USB_OTG_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/USB/examples/HIDVendor/ci.json b/libraries/USB/examples/HIDVendor/ci.json
index e7d65393dd6..f9ac7d0bec9 100644
--- a/libraries/USB/examples/HIDVendor/ci.json
+++ b/libraries/USB/examples/HIDVendor/ci.json
@@ -1,8 +1,5 @@
 {
-  "targets": {
-    "esp32": false,
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_USB_OTG_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/USB/examples/Keyboard/KeyboardLogout/ci.json b/libraries/USB/examples/Keyboard/KeyboardLogout/ci.json
index e7d65393dd6..f9ac7d0bec9 100644
--- a/libraries/USB/examples/Keyboard/KeyboardLogout/ci.json
+++ b/libraries/USB/examples/Keyboard/KeyboardLogout/ci.json
@@ -1,8 +1,5 @@
 {
-  "targets": {
-    "esp32": false,
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_USB_OTG_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/USB/examples/Keyboard/KeyboardMessage/ci.json b/libraries/USB/examples/Keyboard/KeyboardMessage/ci.json
index e7d65393dd6..f9ac7d0bec9 100644
--- a/libraries/USB/examples/Keyboard/KeyboardMessage/ci.json
+++ b/libraries/USB/examples/Keyboard/KeyboardMessage/ci.json
@@ -1,8 +1,5 @@
 {
-  "targets": {
-    "esp32": false,
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_USB_OTG_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/USB/examples/Keyboard/KeyboardReprogram/ci.json b/libraries/USB/examples/Keyboard/KeyboardReprogram/ci.json
index e7d65393dd6..f9ac7d0bec9 100644
--- a/libraries/USB/examples/Keyboard/KeyboardReprogram/ci.json
+++ b/libraries/USB/examples/Keyboard/KeyboardReprogram/ci.json
@@ -1,8 +1,5 @@
 {
-  "targets": {
-    "esp32": false,
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_USB_OTG_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/USB/examples/Keyboard/KeyboardSerial/ci.json b/libraries/USB/examples/Keyboard/KeyboardSerial/ci.json
index e7d65393dd6..f9ac7d0bec9 100644
--- a/libraries/USB/examples/Keyboard/KeyboardSerial/ci.json
+++ b/libraries/USB/examples/Keyboard/KeyboardSerial/ci.json
@@ -1,8 +1,5 @@
 {
-  "targets": {
-    "esp32": false,
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_USB_OTG_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/USB/examples/KeyboardAndMouseControl/ci.json b/libraries/USB/examples/KeyboardAndMouseControl/ci.json
index e7d65393dd6..f9ac7d0bec9 100644
--- a/libraries/USB/examples/KeyboardAndMouseControl/ci.json
+++ b/libraries/USB/examples/KeyboardAndMouseControl/ci.json
@@ -1,8 +1,5 @@
 {
-  "targets": {
-    "esp32": false,
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_USB_OTG_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/USB/examples/MIDI/MidiController/ci.json b/libraries/USB/examples/MIDI/MidiController/ci.json
index e7d65393dd6..f9ac7d0bec9 100644
--- a/libraries/USB/examples/MIDI/MidiController/ci.json
+++ b/libraries/USB/examples/MIDI/MidiController/ci.json
@@ -1,8 +1,5 @@
 {
-  "targets": {
-    "esp32": false,
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_USB_OTG_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/USB/examples/MIDI/MidiInterface/ci.json b/libraries/USB/examples/MIDI/MidiInterface/ci.json
index e7d65393dd6..f9ac7d0bec9 100644
--- a/libraries/USB/examples/MIDI/MidiInterface/ci.json
+++ b/libraries/USB/examples/MIDI/MidiInterface/ci.json
@@ -1,8 +1,5 @@
 {
-  "targets": {
-    "esp32": false,
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_USB_OTG_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/USB/examples/MIDI/MidiMusicBox/ci.json b/libraries/USB/examples/MIDI/MidiMusicBox/ci.json
index e7d65393dd6..f9ac7d0bec9 100644
--- a/libraries/USB/examples/MIDI/MidiMusicBox/ci.json
+++ b/libraries/USB/examples/MIDI/MidiMusicBox/ci.json
@@ -1,8 +1,5 @@
 {
-  "targets": {
-    "esp32": false,
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_USB_OTG_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/USB/examples/MIDI/ReceiveMidi/ci.json b/libraries/USB/examples/MIDI/ReceiveMidi/ci.json
index e7d65393dd6..f9ac7d0bec9 100644
--- a/libraries/USB/examples/MIDI/ReceiveMidi/ci.json
+++ b/libraries/USB/examples/MIDI/ReceiveMidi/ci.json
@@ -1,8 +1,5 @@
 {
-  "targets": {
-    "esp32": false,
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_USB_OTG_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/USB/examples/Mouse/ButtonMouseControl/ci.json b/libraries/USB/examples/Mouse/ButtonMouseControl/ci.json
index e7d65393dd6..f9ac7d0bec9 100644
--- a/libraries/USB/examples/Mouse/ButtonMouseControl/ci.json
+++ b/libraries/USB/examples/Mouse/ButtonMouseControl/ci.json
@@ -1,8 +1,5 @@
 {
-  "targets": {
-    "esp32": false,
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_USB_OTG_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/USB/examples/SystemControl/ci.json b/libraries/USB/examples/SystemControl/ci.json
index e7d65393dd6..f9ac7d0bec9 100644
--- a/libraries/USB/examples/SystemControl/ci.json
+++ b/libraries/USB/examples/SystemControl/ci.json
@@ -1,8 +1,5 @@
 {
-  "targets": {
-    "esp32": false,
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_USB_OTG_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/USB/examples/USBMSC/ci.json b/libraries/USB/examples/USBMSC/ci.json
index e7d65393dd6..f9ac7d0bec9 100644
--- a/libraries/USB/examples/USBMSC/ci.json
+++ b/libraries/USB/examples/USBMSC/ci.json
@@ -1,8 +1,5 @@
 {
-  "targets": {
-    "esp32": false,
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_USB_OTG_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/USB/examples/USBSerial/ci.json b/libraries/USB/examples/USBSerial/ci.json
index e7d65393dd6..f9ac7d0bec9 100644
--- a/libraries/USB/examples/USBSerial/ci.json
+++ b/libraries/USB/examples/USBSerial/ci.json
@@ -1,8 +1,5 @@
 {
-  "targets": {
-    "esp32": false,
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_USB_OTG_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/USB/examples/USBVendor/ci.json b/libraries/USB/examples/USBVendor/ci.json
index e7d65393dd6..f9ac7d0bec9 100644
--- a/libraries/USB/examples/USBVendor/ci.json
+++ b/libraries/USB/examples/USBVendor/ci.json
@@ -1,8 +1,5 @@
 {
-  "targets": {
-    "esp32": false,
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_USB_OTG_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/Update/examples/AWS_S3_OTA_Update/ci.json b/libraries/Update/examples/AWS_S3_OTA_Update/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/Update/examples/AWS_S3_OTA_Update/ci.json
+++ b/libraries/Update/examples/AWS_S3_OTA_Update/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/Update/examples/HTTPS_OTA_Update/ci.json b/libraries/Update/examples/HTTPS_OTA_Update/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/Update/examples/HTTPS_OTA_Update/ci.json
+++ b/libraries/Update/examples/HTTPS_OTA_Update/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/Update/examples/HTTP_Client_AES_OTA_Update/ci.json b/libraries/Update/examples/HTTP_Client_AES_OTA_Update/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/Update/examples/HTTP_Client_AES_OTA_Update/ci.json
+++ b/libraries/Update/examples/HTTP_Client_AES_OTA_Update/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/Update/examples/HTTP_Server_AES_OTA_Update/ci.json b/libraries/Update/examples/HTTP_Server_AES_OTA_Update/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/Update/examples/HTTP_Server_AES_OTA_Update/ci.json
+++ b/libraries/Update/examples/HTTP_Server_AES_OTA_Update/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/Update/examples/OTAWebUpdater/ci.json b/libraries/Update/examples/OTAWebUpdater/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/Update/examples/OTAWebUpdater/ci.json
+++ b/libraries/Update/examples/OTAWebUpdater/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/WebServer/examples/AdvancedWebServer/ci.json b/libraries/WebServer/examples/AdvancedWebServer/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/WebServer/examples/AdvancedWebServer/ci.json
+++ b/libraries/WebServer/examples/AdvancedWebServer/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/WebServer/examples/FSBrowser/ci.json b/libraries/WebServer/examples/FSBrowser/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/WebServer/examples/FSBrowser/ci.json
+++ b/libraries/WebServer/examples/FSBrowser/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/WebServer/examples/Filters/ci.json b/libraries/WebServer/examples/Filters/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/WebServer/examples/Filters/ci.json
+++ b/libraries/WebServer/examples/Filters/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/WebServer/examples/HelloServer/ci.json b/libraries/WebServer/examples/HelloServer/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/WebServer/examples/HelloServer/ci.json
+++ b/libraries/WebServer/examples/HelloServer/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/WebServer/examples/HttpAdvancedAuth/ci.json b/libraries/WebServer/examples/HttpAdvancedAuth/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/WebServer/examples/HttpAdvancedAuth/ci.json
+++ b/libraries/WebServer/examples/HttpAdvancedAuth/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/WebServer/examples/HttpAuthCallback/ci.json b/libraries/WebServer/examples/HttpAuthCallback/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/WebServer/examples/HttpAuthCallback/ci.json
+++ b/libraries/WebServer/examples/HttpAuthCallback/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/WebServer/examples/HttpAuthCallbackInline/ci.json b/libraries/WebServer/examples/HttpAuthCallbackInline/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/WebServer/examples/HttpAuthCallbackInline/ci.json
+++ b/libraries/WebServer/examples/HttpAuthCallbackInline/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/WebServer/examples/HttpBasicAuth/ci.json b/libraries/WebServer/examples/HttpBasicAuth/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/WebServer/examples/HttpBasicAuth/ci.json
+++ b/libraries/WebServer/examples/HttpBasicAuth/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/WebServer/examples/HttpBasicAuthSHA1/ci.json b/libraries/WebServer/examples/HttpBasicAuthSHA1/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/WebServer/examples/HttpBasicAuthSHA1/ci.json
+++ b/libraries/WebServer/examples/HttpBasicAuthSHA1/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/WebServer/examples/HttpBasicAuthSHA1orBearerToken/ci.json b/libraries/WebServer/examples/HttpBasicAuthSHA1orBearerToken/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/WebServer/examples/HttpBasicAuthSHA1orBearerToken/ci.json
+++ b/libraries/WebServer/examples/HttpBasicAuthSHA1orBearerToken/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/WebServer/examples/MultiHomedServers/ci.json b/libraries/WebServer/examples/MultiHomedServers/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/WebServer/examples/MultiHomedServers/ci.json
+++ b/libraries/WebServer/examples/MultiHomedServers/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/WebServer/examples/PathArgServer/ci.json b/libraries/WebServer/examples/PathArgServer/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/WebServer/examples/PathArgServer/ci.json
+++ b/libraries/WebServer/examples/PathArgServer/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/WebServer/examples/SDWebServer/ci.json b/libraries/WebServer/examples/SDWebServer/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/WebServer/examples/SDWebServer/ci.json
+++ b/libraries/WebServer/examples/SDWebServer/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/WebServer/examples/SimpleAuthentification/ci.json b/libraries/WebServer/examples/SimpleAuthentification/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/WebServer/examples/SimpleAuthentification/ci.json
+++ b/libraries/WebServer/examples/SimpleAuthentification/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/WebServer/examples/UploadHugeFile/ci.json b/libraries/WebServer/examples/UploadHugeFile/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/WebServer/examples/UploadHugeFile/ci.json
+++ b/libraries/WebServer/examples/UploadHugeFile/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/WebServer/examples/WebServer/ci.json b/libraries/WebServer/examples/WebServer/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/WebServer/examples/WebServer/ci.json
+++ b/libraries/WebServer/examples/WebServer/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/WebServer/examples/WebUpdate/ci.json b/libraries/WebServer/examples/WebUpdate/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/WebServer/examples/WebUpdate/ci.json
+++ b/libraries/WebServer/examples/WebUpdate/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/WiFi/examples/FTM/FTM_Initiator/ci.json b/libraries/WiFi/examples/FTM/FTM_Initiator/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/WiFi/examples/FTM/FTM_Initiator/ci.json
+++ b/libraries/WiFi/examples/FTM/FTM_Initiator/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/WiFi/examples/FTM/FTM_Responder/ci.json b/libraries/WiFi/examples/FTM/FTM_Responder/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/WiFi/examples/FTM/FTM_Responder/ci.json
+++ b/libraries/WiFi/examples/FTM/FTM_Responder/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/WiFi/examples/SimpleWiFiServer/ci.json b/libraries/WiFi/examples/SimpleWiFiServer/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/WiFi/examples/SimpleWiFiServer/ci.json
+++ b/libraries/WiFi/examples/SimpleWiFiServer/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/WiFi/examples/WPS/ci.json b/libraries/WiFi/examples/WPS/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/WiFi/examples/WPS/ci.json
+++ b/libraries/WiFi/examples/WPS/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/WiFi/examples/WiFiAccessPoint/ci.json b/libraries/WiFi/examples/WiFiAccessPoint/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/WiFi/examples/WiFiAccessPoint/ci.json
+++ b/libraries/WiFi/examples/WiFiAccessPoint/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/WiFi/examples/WiFiBlueToothSwitch/ci.json b/libraries/WiFi/examples/WiFiBlueToothSwitch/ci.json
index 521ae8f5ff1..49a24f931bf 100644
--- a/libraries/WiFi/examples/WiFiBlueToothSwitch/ci.json
+++ b/libraries/WiFi/examples/WiFiBlueToothSwitch/ci.json
@@ -1,6 +1,8 @@
 {
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ],
   "targets": {
-    "esp32h2": false,
     "esp32s2": false
   }
 }
diff --git a/libraries/WiFi/examples/WiFiClient/ci.json b/libraries/WiFi/examples/WiFiClient/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/WiFi/examples/WiFiClient/ci.json
+++ b/libraries/WiFi/examples/WiFiClient/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/WiFi/examples/WiFiClientBasic/ci.json b/libraries/WiFi/examples/WiFiClientBasic/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/WiFi/examples/WiFiClientBasic/ci.json
+++ b/libraries/WiFi/examples/WiFiClientBasic/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/WiFi/examples/WiFiClientConnect/ci.json b/libraries/WiFi/examples/WiFiClientConnect/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/WiFi/examples/WiFiClientConnect/ci.json
+++ b/libraries/WiFi/examples/WiFiClientConnect/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/WiFi/examples/WiFiClientEnterprise/ci.json b/libraries/WiFi/examples/WiFiClientEnterprise/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/WiFi/examples/WiFiClientEnterprise/ci.json
+++ b/libraries/WiFi/examples/WiFiClientEnterprise/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/WiFi/examples/WiFiClientEvents/ci.json b/libraries/WiFi/examples/WiFiClientEvents/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/WiFi/examples/WiFiClientEvents/ci.json
+++ b/libraries/WiFi/examples/WiFiClientEvents/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/WiFi/examples/WiFiClientStaticIP/ci.json b/libraries/WiFi/examples/WiFiClientStaticIP/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/WiFi/examples/WiFiClientStaticIP/ci.json
+++ b/libraries/WiFi/examples/WiFiClientStaticIP/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/WiFi/examples/WiFiExtender/ci.json b/libraries/WiFi/examples/WiFiExtender/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/WiFi/examples/WiFiExtender/ci.json
+++ b/libraries/WiFi/examples/WiFiExtender/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/WiFi/examples/WiFiIPv6/ci.json b/libraries/WiFi/examples/WiFiIPv6/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/WiFi/examples/WiFiIPv6/ci.json
+++ b/libraries/WiFi/examples/WiFiIPv6/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/WiFi/examples/WiFiMulti/ci.json b/libraries/WiFi/examples/WiFiMulti/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/WiFi/examples/WiFiMulti/ci.json
+++ b/libraries/WiFi/examples/WiFiMulti/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/WiFi/examples/WiFiMultiAdvanced/ci.json b/libraries/WiFi/examples/WiFiMultiAdvanced/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/WiFi/examples/WiFiMultiAdvanced/ci.json
+++ b/libraries/WiFi/examples/WiFiMultiAdvanced/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/WiFi/examples/WiFiScan/ci.json b/libraries/WiFi/examples/WiFiScan/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/WiFi/examples/WiFiScan/ci.json
+++ b/libraries/WiFi/examples/WiFiScan/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/WiFi/examples/WiFiScanAsync/ci.json b/libraries/WiFi/examples/WiFiScanAsync/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/WiFi/examples/WiFiScanAsync/ci.json
+++ b/libraries/WiFi/examples/WiFiScanAsync/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/WiFi/examples/WiFiScanDualAntenna/ci.json b/libraries/WiFi/examples/WiFiScanDualAntenna/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/WiFi/examples/WiFiScanDualAntenna/ci.json
+++ b/libraries/WiFi/examples/WiFiScanDualAntenna/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/WiFi/examples/WiFiScanTime/ci.json b/libraries/WiFi/examples/WiFiScanTime/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/WiFi/examples/WiFiScanTime/ci.json
+++ b/libraries/WiFi/examples/WiFiScanTime/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/WiFi/examples/WiFiSmartConfig/ci.json b/libraries/WiFi/examples/WiFiSmartConfig/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/WiFi/examples/WiFiSmartConfig/ci.json
+++ b/libraries/WiFi/examples/WiFiSmartConfig/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/WiFi/examples/WiFiTelnetToSerial/ci.json b/libraries/WiFi/examples/WiFiTelnetToSerial/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/WiFi/examples/WiFiTelnetToSerial/ci.json
+++ b/libraries/WiFi/examples/WiFiTelnetToSerial/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/WiFi/examples/WiFiUDPClient/ci.json b/libraries/WiFi/examples/WiFiUDPClient/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/WiFi/examples/WiFiUDPClient/ci.json
+++ b/libraries/WiFi/examples/WiFiUDPClient/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/WiFiProv/examples/WiFiProv/ci.json b/libraries/WiFiProv/examples/WiFiProv/ci.json
index d8b3664bc65..36babb82730 100644
--- a/libraries/WiFiProv/examples/WiFiProv/ci.json
+++ b/libraries/WiFiProv/examples/WiFiProv/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/Wire/examples/WireMaster/ci.json b/libraries/Wire/examples/WireMaster/ci.json
new file mode 100644
index 00000000000..1844adfc786
--- /dev/null
+++ b/libraries/Wire/examples/WireMaster/ci.json
@@ -0,0 +1,5 @@
+{
+  "requires": [
+    "CONFIG_SOC_I2C_SUPPORTED=y"
+  ]
+}
diff --git a/libraries/Wire/examples/WireScan/ci.json b/libraries/Wire/examples/WireScan/ci.json
new file mode 100644
index 00000000000..1844adfc786
--- /dev/null
+++ b/libraries/Wire/examples/WireScan/ci.json
@@ -0,0 +1,5 @@
+{
+  "requires": [
+    "CONFIG_SOC_I2C_SUPPORTED=y"
+  ]
+}
diff --git a/libraries/Wire/examples/WireSlave/ci.json b/libraries/Wire/examples/WireSlave/ci.json
index 46e0dfffebb..3c877975d62 100644
--- a/libraries/Wire/examples/WireSlave/ci.json
+++ b/libraries/Wire/examples/WireSlave/ci.json
@@ -1,5 +1,5 @@
 {
-  "targets": {
-    "esp32c2": false
-  }
+  "requires": [
+    "CONFIG_SOC_I2C_SUPPORT_SLAVE=y"
+  ]
 }
diff --git a/tests/validation/democfg/ci.json b/tests/validation/democfg/ci.json
index f74aa4e7eda..e4f275a4bca 100644
--- a/tests/validation/democfg/ci.json
+++ b/tests/validation/democfg/ci.json
@@ -16,6 +16,9 @@
     "qemu": false,
     "wokwi": true
   },
+  "requires": [
+    "CONFIG_SOC_UART_SUPPORTED=y"
+  ],
   "targets": {
     "esp32": true,
     "esp32c3": true,
diff --git a/tests/validation/touch/ci.json b/tests/validation/touch/ci.json
index 8d58dbf5250..855e9bd964d 100644
--- a/tests/validation/touch/ci.json
+++ b/tests/validation/touch/ci.json
@@ -3,9 +3,7 @@
     "qemu": false,
     "wokwi": false
   },
-  "targets": {
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_TOUCH_SENSOR_SUPPORTED=y"
+  ]
 }
diff --git a/tests/validation/wifi/ci.json b/tests/validation/wifi/ci.json
index ff2c1d7c9ce..36e91b221cb 100644
--- a/tests/validation/wifi/ci.json
+++ b/tests/validation/wifi/ci.json
@@ -21,7 +21,7 @@
     "hardware": false,
     "qemu": false
   },
-  "targets": {
-    "esp32h2": false
-  }
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
+  ]
 }

From 74d3868a914dff8a5799fba7f5f1fe77910f832c Mon Sep 17 00:00:00 2001
From: Lucas Saavedra Vaz <32426024+lucasssvaz@users.noreply.github.com>
Date: Sat, 28 Sep 2024 20:42:17 -0300
Subject: [PATCH 6/8] fix(json): Fix requirements for touch tests

---
 libraries/ESP32/examples/Touch/TouchButton/ci.json   | 2 +-
 libraries/ESP32/examples/Touch/TouchButtonV2/ci.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/ESP32/examples/Touch/TouchButton/ci.json b/libraries/ESP32/examples/Touch/TouchButton/ci.json
index c0ecf9fc0a5..cec76a84f9d 100644
--- a/libraries/ESP32/examples/Touch/TouchButton/ci.json
+++ b/libraries/ESP32/examples/Touch/TouchButton/ci.json
@@ -1,5 +1,5 @@
 {
   "requires": [
-    "CONFIG_SOC_TOUCH_SENSOR_SUPPORTED=y"
+    "CONFIG_SOC_TOUCH_VERSION_1=y"
   ]
 }
diff --git a/libraries/ESP32/examples/Touch/TouchButtonV2/ci.json b/libraries/ESP32/examples/Touch/TouchButtonV2/ci.json
index c0ecf9fc0a5..2710fa7940e 100644
--- a/libraries/ESP32/examples/Touch/TouchButtonV2/ci.json
+++ b/libraries/ESP32/examples/Touch/TouchButtonV2/ci.json
@@ -1,5 +1,5 @@
 {
   "requires": [
-    "CONFIG_SOC_TOUCH_SENSOR_SUPPORTED=y"
+    "CONFIG_SOC_TOUCH_VERSION_2=y"
   ]
 }

From a2a090d9e0b6330b2dcef86fc6eeeec0ac1bf7d1 Mon Sep 17 00:00:00 2001
From: Lucas Saavedra Vaz <32426024+lucasssvaz@users.noreply.github.com>
Date: Sat, 28 Sep 2024 20:45:42 -0300
Subject: [PATCH 7/8] refactor(json): Fix formatting of JSON files

---
 libraries/ESP_SR/examples/Basic/ci.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libraries/ESP_SR/examples/Basic/ci.json b/libraries/ESP_SR/examples/Basic/ci.json
index 4b3465ad836..c9b0955f8f2 100644
--- a/libraries/ESP_SR/examples/Basic/ci.json
+++ b/libraries/ESP_SR/examples/Basic/ci.json
@@ -4,14 +4,14 @@
       "espressif:esp32:esp32s3:USBMode=default,PartitionScheme=esp_sr_16,FlashSize=16M,FlashMode=dio"
     ]
   },
+  "requires": [
+    "CONFIG_SOC_I2S_SUPPORTED=y"
+  ],
   "targets": {
     "esp32": false,
     "esp32c3": false,
     "esp32c6": false,
     "esp32h2": false,
     "esp32s2": false
-  },
-  "requires": [
-    "CONFIG_SOC_I2S_SUPPORTED=y"
-  ]
+  }
 }

From 50fd9bf0451ebc504680d6dd45a09862857869ae Mon Sep 17 00:00:00 2001
From: Lucas Saavedra Vaz <32426024+lucasssvaz@users.noreply.github.com>
Date: Sat, 28 Sep 2024 21:44:16 -0300
Subject: [PATCH 8/8] fix(spi): Fix SPI example and JSON

---
 .../SPI/examples/SPI_Multiple_Buses/SPI_Multiple_Buses.ino      | 2 +-
 libraries/SPI/examples/SPI_Multiple_Buses/ci.json               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/SPI/examples/SPI_Multiple_Buses/SPI_Multiple_Buses.ino b/libraries/SPI/examples/SPI_Multiple_Buses/SPI_Multiple_Buses.ino
index c73f6078c03..06765c64fd2 100644
--- a/libraries/SPI/examples/SPI_Multiple_Buses/SPI_Multiple_Buses.ino
+++ b/libraries/SPI/examples/SPI_Multiple_Buses/SPI_Multiple_Buses.ino
@@ -39,7 +39,7 @@
 #define HSPI_SS   15
 #endif
 
-#if CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
+#if !defined(CONFIG_IDF_TARGET_ESP32)
 #define VSPI FSPI
 #endif
 
diff --git a/libraries/SPI/examples/SPI_Multiple_Buses/ci.json b/libraries/SPI/examples/SPI_Multiple_Buses/ci.json
index 857d589531d..cd27a02724b 100644
--- a/libraries/SPI/examples/SPI_Multiple_Buses/ci.json
+++ b/libraries/SPI/examples/SPI_Multiple_Buses/ci.json
@@ -1,5 +1,5 @@
 {
   "requires": [
-    "CONFIG_SOC_SPI_PERIPH_NUM=[2-9]|CONFIG_SOC_SPI_PERIPH_NUM=[1-9][0-9]+"
+    "CONFIG_SOC_SPI_PERIPH_NUM=[2-9]"
   ]
 }