From d28232b9f8c2cc5c0c66cc5b4d767b4f329e66d3 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Thu, 21 Sep 2023 16:30:18 +0200 Subject: [PATCH] fix(mdns): move the example into a subdirectory By default, component manager expects that the examples are located under /examples/. Move mdns example so that it is found. --- .github/workflows/mdns__build-target-test.yml | 4 ++-- components/mdns/examples/{ => query_advertise}/CMakeLists.txt | 2 +- components/mdns/examples/{ => query_advertise}/README.md | 2 +- .../mdns/examples/{ => query_advertise}/main/CMakeLists.txt | 0 .../examples/{ => query_advertise}/main/Kconfig.projbuild | 0 .../examples/{ => query_advertise}/main/idf_component.yml | 1 + .../examples/{ => query_advertise}/main/mdns_example_main.c | 0 components/mdns/examples/{ => query_advertise}/pytest_mdns.py | 0 .../{ => query_advertise}/sdkconfig.ci.eth_custom_netif | 0 .../mdns/examples/{ => query_advertise}/sdkconfig.ci.eth_def | 0 .../examples/{ => query_advertise}/sdkconfig.ci.eth_no_ipv6 | 0 .../examples/{ => query_advertise}/sdkconfig.ci.eth_socket | 0 12 files changed, 5 insertions(+), 4 deletions(-) rename components/mdns/examples/{ => query_advertise}/CMakeLists.txt (89%) rename components/mdns/examples/{ => query_advertise}/README.md (98%) rename components/mdns/examples/{ => query_advertise}/main/CMakeLists.txt (100%) rename components/mdns/examples/{ => query_advertise}/main/Kconfig.projbuild (100%) rename components/mdns/examples/{ => query_advertise}/main/idf_component.yml (86%) rename components/mdns/examples/{ => query_advertise}/main/mdns_example_main.c (100%) rename components/mdns/examples/{ => query_advertise}/pytest_mdns.py (100%) rename components/mdns/examples/{ => query_advertise}/sdkconfig.ci.eth_custom_netif (100%) rename components/mdns/examples/{ => query_advertise}/sdkconfig.ci.eth_def (100%) rename components/mdns/examples/{ => query_advertise}/sdkconfig.ci.eth_no_ipv6 (100%) rename components/mdns/examples/{ => query_advertise}/sdkconfig.ci.eth_socket (100%) diff --git a/.github/workflows/mdns__build-target-test.yml b/.github/workflows/mdns__build-target-test.yml index 2baf99a0c..868256a76 100644 --- a/.github/workflows/mdns__build-target-test.yml +++ b/.github/workflows/mdns__build-target-test.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: idf_ver: ["latest", "release-v5.0"] - test: [ { app: example, path: "examples" }, { app: unit_test, path: "tests/unit_test" }, { app: test_app, path: "tests/test_apps" } ] + test: [ { app: example, path: "examples/query_advertise" }, { app: unit_test, path: "tests/unit_test" }, { app: test_app, path: "tests/test_apps" } ] runs-on: ubuntu-20.04 container: espressif/idf:${{ matrix.idf_ver }} steps: @@ -50,7 +50,7 @@ jobs: matrix: idf_ver: ["latest"] idf_target: ["esp32"] - test: [ { app: example, path: "examples" }, { app: unit_test, path: "tests/unit_test" }, { app: test_app, path: "tests/test_apps" } ] + test: [ { app: example, path: "examples/query_advertise" }, { app: unit_test, path: "tests/unit_test" }, { app: test_app, path: "tests/test_apps" } ] needs: build_mdns runs-on: - self-hosted diff --git a/components/mdns/examples/CMakeLists.txt b/components/mdns/examples/query_advertise/CMakeLists.txt similarity index 89% rename from components/mdns/examples/CMakeLists.txt rename to components/mdns/examples/query_advertise/CMakeLists.txt index cf9625cbe..9a16f140a 100644 --- a/components/mdns/examples/CMakeLists.txt +++ b/components/mdns/examples/query_advertise/CMakeLists.txt @@ -3,4 +3,4 @@ cmake_minimum_required(VERSION 3.5) include($ENV{IDF_PATH}/tools/cmake/project.cmake) -project(mdns_test) +project(query_advertise) diff --git a/components/mdns/examples/README.md b/components/mdns/examples/query_advertise/README.md similarity index 98% rename from components/mdns/examples/README.md rename to components/mdns/examples/query_advertise/README.md index 04047a6f7..6ccdef970 100644 --- a/components/mdns/examples/README.md +++ b/components/mdns/examples/query_advertise/README.md @@ -1,6 +1,6 @@ # mDNS example -Shows how to use mDNS to advertise lookup services and hosts +Shows how to use mDNS to advertise and query services and hosts ## Example workflow diff --git a/components/mdns/examples/main/CMakeLists.txt b/components/mdns/examples/query_advertise/main/CMakeLists.txt similarity index 100% rename from components/mdns/examples/main/CMakeLists.txt rename to components/mdns/examples/query_advertise/main/CMakeLists.txt diff --git a/components/mdns/examples/main/Kconfig.projbuild b/components/mdns/examples/query_advertise/main/Kconfig.projbuild similarity index 100% rename from components/mdns/examples/main/Kconfig.projbuild rename to components/mdns/examples/query_advertise/main/Kconfig.projbuild diff --git a/components/mdns/examples/main/idf_component.yml b/components/mdns/examples/query_advertise/main/idf_component.yml similarity index 86% rename from components/mdns/examples/main/idf_component.yml rename to components/mdns/examples/query_advertise/main/idf_component.yml index 952edfb0d..e9277dfc9 100644 --- a/components/mdns/examples/main/idf_component.yml +++ b/components/mdns/examples/query_advertise/main/idf_component.yml @@ -3,5 +3,6 @@ dependencies: idf: ">=5.0" espressif/mdns: version: "^1.0.0" + override_path: "../../../" protocol_examples_common: path: ${IDF_PATH}/examples/common_components/protocol_examples_common diff --git a/components/mdns/examples/main/mdns_example_main.c b/components/mdns/examples/query_advertise/main/mdns_example_main.c similarity index 100% rename from components/mdns/examples/main/mdns_example_main.c rename to components/mdns/examples/query_advertise/main/mdns_example_main.c diff --git a/components/mdns/examples/pytest_mdns.py b/components/mdns/examples/query_advertise/pytest_mdns.py similarity index 100% rename from components/mdns/examples/pytest_mdns.py rename to components/mdns/examples/query_advertise/pytest_mdns.py diff --git a/components/mdns/examples/sdkconfig.ci.eth_custom_netif b/components/mdns/examples/query_advertise/sdkconfig.ci.eth_custom_netif similarity index 100% rename from components/mdns/examples/sdkconfig.ci.eth_custom_netif rename to components/mdns/examples/query_advertise/sdkconfig.ci.eth_custom_netif diff --git a/components/mdns/examples/sdkconfig.ci.eth_def b/components/mdns/examples/query_advertise/sdkconfig.ci.eth_def similarity index 100% rename from components/mdns/examples/sdkconfig.ci.eth_def rename to components/mdns/examples/query_advertise/sdkconfig.ci.eth_def diff --git a/components/mdns/examples/sdkconfig.ci.eth_no_ipv6 b/components/mdns/examples/query_advertise/sdkconfig.ci.eth_no_ipv6 similarity index 100% rename from components/mdns/examples/sdkconfig.ci.eth_no_ipv6 rename to components/mdns/examples/query_advertise/sdkconfig.ci.eth_no_ipv6 diff --git a/components/mdns/examples/sdkconfig.ci.eth_socket b/components/mdns/examples/query_advertise/sdkconfig.ci.eth_socket similarity index 100% rename from components/mdns/examples/sdkconfig.ci.eth_socket rename to components/mdns/examples/query_advertise/sdkconfig.ci.eth_socket