Skip to content

Commit 61b1fcd

Browse files
committed
entrypoint: Move pip install commands to the correct position
Ensure that the pip install commands for requirements-dev.txt and requirements-doc.txt are executed before the Espressif IDF setup, improving the build process for the espressif port. Signed-off-by: Chiho Sin <[email protected]>
1 parent fe80e43 commit 61b1fcd

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Containerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ ENTRYPOINT [ "/entrypoint.sh" ]
137137
FROM repo AS espressif
138138

139139
ENV CPY_PORT=espressif
140+
140141
ENV IDF_PATH=/workspace/ports/espressif/esp-idf
141142
ENV IDF_TOOLS_PATH=/workspace/.idf_tools
142143
ENV ESP_ROM_ELF_DIR=/workspace/.idf_tools

entrypoint.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ echo "Repository firmware MicroPython version: $(git describe --tags --dirty --a
2424
# trunk-ignore(shellcheck/SC2312)
2525
echo "Repository firmware CircuitPython version: $(python3 py/version.py)"
2626

27+
pip3 install --upgrade -r requirements-dev.txt
28+
pip3 install --upgrade -r requirements-doc.txt
29+
2730
# Espressif IDF
2831
if [[ ${CPY_PORT} == "espressif" ]]; then
2932
export IDF_PATH=/workspace/ports/espressif/esp-idf
@@ -35,8 +38,6 @@ fi
3538

3639
JOBS=$(nproc)
3740

38-
pip3 install --upgrade -r requirements-dev.txt
39-
pip3 install --upgrade -r requirements-doc.txt
4041
make -C ports/"${CPY_PORT}" fetch-port-submodules
4142
git repack -d
4243
make -j"${JOBS}" -C mpy-cross

0 commit comments

Comments
 (0)