Skip to content

Commit ec661be

Browse files
committed
Merge branch 'bugfix/ci_make_error_detection' into 'master'
ci: fix make error detection, fix another IDF_ENV_FPGA issue See merge request espressif/esp-idf!9440
2 parents 664bf79 + ee4079e commit ec661be

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

make/ldgen.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ $(2): $(1) $(LDGEN_FRAGMENT_FILES) $(SDKCONFIG) $(BUILD_DIR_BASE)/ldgen_librarie
4444
--env "COMPONENT_KCONFIGS_SOURCE_FILE=$(COMPONENT_KCONFIGS_SOURCE_FILE)" \
4545
--env "COMPONENT_KCONFIGS_PROJBUILD_SOURCE_FILE=$(COMPONENT_KCONFIGS_PROJBUILD_SOURCE_FILE)" \
4646
--env "IDF_CMAKE=n" \
47+
--env "IDF_ENV_FPGA=n" \
4748
--objdump $(OBJDUMP)
4849
endef
4950
endif # Windows_NT

tools/ci/check_build_warnings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
1919
from find_build_apps import BuildItem, setup_logging
2020

21-
WARNING_REGEX = re.compile(r"(?:error|warning)", re.MULTILINE | re.IGNORECASE)
21+
WARNING_REGEX = re.compile(r"(?:error|warning)[^\w]", re.MULTILINE | re.IGNORECASE)
2222

2323
IGNORE_WARNS = [
2424
re.compile(r_str) for r_str in [

0 commit comments

Comments
 (0)