Merge branch 'fix/ci_build_with_local_button' into 'master'

fix(ci): fix ci build with local button See merge request ae_group/esp-iot-solution!1212
espressif · Jan 24, 2025 · 6a112f4 · 6a112f4
2 parents aaae173 + b6a30c9
commit 6a112f4
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml
@@ -1481,6 +1481,8 @@
     - <<: *if-trigger-job
     - <<: *if-dev-push
       changes: *patterns-build_system
+    - <<: *if-dev-push
+      changes: *patterns-components_button
     - <<: *if-dev-push
       changes: *patterns-components_usb_esp_msc_ota
     - <<: *if-dev-push

diff --git a/examples/common_components/boards/idf_component.yml b/examples/common_components/boards/idf_component.yml
@@ -10,6 +10,6 @@ dependencies:
   bus:
     override_path: "../../../components/bus"
   espressif/button:
-    version: "~2.5.0"
+    version: "^3.0.0"
   espressif/led_strip:
     version: "~1.1.0-alpha" #please use version 2.0.0 if idf5.0
diff --git a/examples/sensors/sensor_hub_monitor/main/idf_component.yml b/examples/sensors/sensor_hub_monitor/main/idf_component.yml
@@ -2,9 +2,6 @@ dependencies:
   boards:
     version: "~0.0.1"
     override_path: "../../../common_components/boards"
-  button:
-    public: true
-    override_path: "../../../../components/button"
   sensor_hub:
     public: true
     override_path: "../../../../components/sensors/sensor_hub"

diff --git a/examples/usb/otg/usb_host_device_mode_manual_switch/main/manual_switch.c b/examples/usb/otg/usb_host_device_mode_manual_switch/main/manual_switch.c
@@ -10,6 +10,7 @@
 #include "usb_host_msc.h"
 #include "usb_device_cdc.h"
 #include "iot_button.h"
+#include "button_gpio.h"
 
 static const char *TAG = "manual_switch";