espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-02 12:14:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/ci_make_error_detection' into 'master'

Browse Source 
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
parent 664bf79379 ee4079e7c7
commit ec661be38d
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
make/ldgen.mk
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_SOURCE_FILE=$(COMPONENT_KCONFIGS_SOURCE_FILE)" \
--env "COMPONENT_KCONFIGS_PROJBUILD_SOURCE_FILE=$(COMPONENT_KCONFIGS_PROJBUILD_SOURCE_FILE)" \ --env "COMPONENT_KCONFIGS_PROJBUILD_SOURCE_FILE=$(COMPONENT_KCONFIGS_PROJBUILD_SOURCE_FILE)" \
--env "IDF_CMAKE=n" \ --env "IDF_CMAKE=n" \
--env "IDF_ENV_FPGA=n" \
--objdump $(OBJDUMP) --objdump $(OBJDUMP)
endef endef
endif # Windows_NT endif # Windows_NT

2
tools/ci/check_build_warnings.py
View File

@@ -18,7 +18,7 @@ except ImportError:
sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..")) sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
from find_build_apps import BuildItem, setup_logging 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 = [ IGNORE_WARNS = [
re.compile(r_str) for r_str in [ re.compile(r_str) for r_str in [