Merge branch 'ci/fix_p4_build_failures' into 'master'

ci: fix ESP32-P4 build failures in CI See merge request espressif/esp-idf!29249
espressif · Feb 26, 2024 · 5eb058e · 5eb058e
2 parents b71dabf + 19104b4
commit 5eb058e
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 12 deletions.
diff --git a/examples/protocols/.build-test-rules.yml b/examples/protocols/.build-test-rules.yml
@@ -89,9 +89,9 @@ examples/protocols/https_mbedtls:
 examples/protocols/https_request:
   <<: *default_dependencies
   disable:
-    - if: IDF_TARGET in ["esp32h2"]
+    - if: IDF_TARGET in ["esp32h2", "esp32p4"]
       temporary: true
-      reason: not supported on h2 # TODO: IDF-9076 (H2)
+      reason: not supported on h2 and p4 # TODO: IDF-9076 (H2)
   disable_test:
     - if: IDF_TARGET != "esp32"
       reason: only test on esp32

diff --git a/examples/protocols/http_server/restful_server/sdkconfig.defaults.esp32p4 b/examples/protocols/http_server/restful_server/sdkconfig.defaults.esp32p4
@@ -0,0 +1,2 @@
+CONFIG_MDNS_PREDEF_NETIF_STA=n
+CONFIG_MDNS_PREDEF_NETIF_AP=n
diff --git a/examples/protocols/https_request/README.md b/examples/protocols/https_request/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
 
 # HTTPS Request Example
 

diff --git a/examples/system/.build-test-rules.yml b/examples/system/.build-test-rules.yml
@@ -140,9 +140,9 @@ examples/system/light_sleep:
 
 examples/system/ota/advanced_https_ota:
   disable:
-    - if: IDF_TARGET in ["esp32h2"]
+    - if: IDF_TARGET in ["esp32h2", "esp32p4"]
       temporary: true
-      reason: target esp32h2 is not supported yet
+      reason: target esp32h2 is not supported yet, esp32p4 is not supported with bluedroid/nimble case
   disable_test:
     - if: IDF_TARGET not in ["esp32", "esp32c3", "esp32s3"]
       temporary: true
@@ -204,9 +204,9 @@ examples/system/ota/pre_encrypted_ota:
 
 examples/system/ota/simple_ota_example:
   disable:
-    - if: IDF_TARGET in ["esp32h2"]
+    - if: IDF_TARGET in ["esp32h2", "esp32p4"]
       temporary: true
-      reason: target esp32h2 is not supported yet
+      reason: target esp32h2, esp32p4 is not supported yet
     - if: CONFIG_NAME == "spiram" and SOC_SPIRAM_SUPPORTED != 1
   disable_test:
     - if: IDF_TARGET not in ["esp32", "esp32c3", "esp32s3"]

diff --git a/examples/system/ota/advanced_https_ota/README.md b/examples/system/ota/advanced_https_ota/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
 
 # Advanced HTTPS OTA example
 

diff --git a/examples/system/ota/simple_ota_example/README.md b/examples/system/ota/simple_ota_example/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
 
 # Simple OTA example
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		CONFIG_MDNS_PREDEF_NETIF_STA=n
		CONFIG_MDNS_PREDEF_NETIF_AP=n