Skip to content

Commit faac5a7

Browse files
committed
Merge branch 'contrib/github_pr_481' into 'master'
fix(button): include stdbool.h before using bool (GitHub PR) Closes AEGHB-1006 See merge request ae_group/esp-iot-solution!1245
2 parents 76db88e + 36ecadd commit faac5a7

File tree

5 files changed

+13
-6
lines changed

5 files changed

+13
-6
lines changed

.gitlab-ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ stages:
44
- target_test
55
- build_docs
66
- deploy
7+
- post_deploy
78

89
workflow:
910
rules:

.gitlab/ci/deploy.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,13 @@ deploy_docs_production:
8989
DOCS_DEPLOY_URL_BASE: "$DOCS_PROD_URL_BASE"
9090

9191
post_links:
92-
stage: deploy
92+
stage: post_deploy
93+
extends:
94+
- .rules:deploy:docs_preview
9395
tags: [deploy_docs]
9496
image: $ESP_DOCS_ENV_IMAGE
9597
needs:
9698
- deploy_docs_preview
97-
rules:
98-
# Run for all changes to a merge request's source branch
99-
- if: $CI_PIPELINE_SOURCE == 'merge_request_event'
10099
script:
101100
- ls -al logs
102101
- python3 ${CI_PROJECT_DIR}/tools/ci/post-mr-note.py $GITLAB_MR_NOTE_TOKEN $CI_PROJECT_PATH $CI_MERGE_REQUEST_IID

components/button/CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
# ChangeLog
22

3+
## v4.1.1 - 2025-03-13
4+
5+
### Improve:
6+
7+
* include stdbool.h before using bool
8+
39
## v4.1.0 - 2025-02-28
410

511
### Improve:
612

7-
- Update the version of dependent cmake_utilities to *
13+
* Update the version of dependent cmake_utilities to *
814

915
## v4.0.0 - 2025-1-9
1016

components/button/idf_component.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: "4.1.0"
1+
version: "4.1.1"
22
description: GPIO and ADC and Matrix button driver
33
url: https://github.com/espressif/esp-iot-solution/tree/master/components/button
44
repository: https://github.com/espressif/esp-iot-solution.git

components/button/interface/button_interface.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66
#pragma once
77

8+
#include <stdbool.h>
89
#include <stdint.h>
910
#include "esp_err.h"
1011

0 commit comments

Comments
 (0)