Skip to content

Commit 6c4f209

Browse files
authored
Merge pull request #8310 from jepler/fix-doc-build-119
Use a different way to force building sdkconfig early
2 parents 282e93d + 3cd667a commit 6c4f209

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

ports/espressif/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ endif
353353
# create the config headers
354354
.PHONY: do-sdkconfig
355355
do-sdkconfig: $(BUILD)/esp-idf/config/sdkconfig.h
356-
Makefile: $(BUILD)/esp-idf/config/sdkconfig.h
356+
$(BUILD)/genhdr/qstr.i.last: $(BUILD)/esp-idf/config/sdkconfig.h
357357
$(BUILD)/esp-idf/config/sdkconfig.h: boards/$(BOARD)/sdkconfig CMakeLists.txt | $(BUILD)/esp-idf
358358
IDF_PATH=$(IDF_PATH) cmake -S . -B $(BUILD)/esp-idf -DSDKCONFIG=$(BUILD)/esp-idf/sdkconfig -DSDKCONFIG_DEFAULTS="$(SDKCONFIGS)" -DCMAKE_TOOLCHAIN_FILE=$(IDF_PATH)/tools/cmake/toolchain-$(IDF_TARGET).cmake -DIDF_TARGET=$(IDF_TARGET) -GNinja -DCIRCUITPY_ESPCAMERA=$(CIRCUITPY_ESPCAMERA)
359359

tools/ci_set_matrix.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
PATTERN_DOCS = (
5656
r"^(?:\.github|docs|extmod\/ulab)|"
5757
r"^(?:(?:ports\/\w+\/bindings|shared-bindings)\S+\.c|tools\/extract_pyi\.py|\.readthedocs\.yml|conf\.py|requirements-doc\.txt)$|"
58-
r"(?:-stubs|\.(?:md|MD|rst|RST))$"
58+
r"(?:-stubs|\.(?:md|MD|mk|rst|RST)|/Makefile)$"
5959
)
6060

6161
PATTERN_WINDOWS = {

0 commit comments

Comments
 (0)