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
This commit is contained in:
Ivan Grokhotkov 2020-07-01 21:07:40 +08:00
commit ec661be38d
2 changed files with 2 additions and 1 deletions

View file

@ -44,6 +44,7 @@ $(2): $(1) $(LDGEN_FRAGMENT_FILES) $(SDKCONFIG) $(BUILD_DIR_BASE)/ldgen_librarie
--env "COMPONENT_KCONFIGS_SOURCE_FILE=$(COMPONENT_KCONFIGS_SOURCE_FILE)" \
--env "COMPONENT_KCONFIGS_PROJBUILD_SOURCE_FILE=$(COMPONENT_KCONFIGS_PROJBUILD_SOURCE_FILE)" \
--env "IDF_CMAKE=n" \
--env "IDF_ENV_FPGA=n" \
--objdump $(OBJDUMP)
endef
endif # Windows_NT

View file

@ -18,7 +18,7 @@ except ImportError:
sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
from find_build_apps import BuildItem, setup_logging
WARNING_REGEX = re.compile(r"(?:error|warning)", re.MULTILINE | re.IGNORECASE)
WARNING_REGEX = re.compile(r"(?:error|warning)[^\w]", re.MULTILINE | re.IGNORECASE)
IGNORE_WARNS = [
re.compile(r_str) for r_str in [