Skip to content

Commit 46c1a94

Browse files
committed
build: rearrange firmware version echoing
Moved the firmware version retrieval and echoing to occur after the build process setup for better clarity and organization. Signed-off-by: Chiho Sin <[email protected]>
1 parent 42ec87d commit 46c1a94

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

entrypoint.sh

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ git repack -d
2323
pip3 install --upgrade -r requirements-dev.txt
2424
pip3 install --upgrade -r requirements-doc.txt
2525

26-
FW_TAG=$(python3 py/version.py)
27-
# trunk-ignore(shellcheck/SC2312)
28-
echo "Repository firmware CircuitPython version: ${FW_TAG}"
29-
3026
# Espressif IDF
3127
if [[ ${CPY_PORT} == "espressif" ]]; then
3228
export IDF_PATH=/workspace/ports/espressif/esp-idf
@@ -38,7 +34,10 @@ fi
3834

3935
make -j"${JOBS}" -C mpy-cross
4036
make -C ports/"${CPY_PORT}" fetch-port-submodules
41-
mkdir -p "${WORKSPACE}/bin"
37+
38+
FW_TAG=$(python3 py/version.py)
39+
echo "Repository firmware CircuitPython version: ${FW_TAG}"
40+
4241

4342
# Build
4443
echo "Build ${CPY_PORT} firmware: ${BOARD}"
@@ -55,7 +54,6 @@ function copy_artefacts {
5554
if [[ -r ${build_dir}/firmware.${ext} ]]; then
5655
mv "${build_dir}"/firmware."${ext}" "${dest}"
5756
elif [[ -r ${build_dir}/circuitpython.${ext} ]]; then
58-
# esp32 has micropython.elf, etc
5957
mv "${build_dir}"/circuitpython."${ext}" "${dest}"
6058
# trunk-ignore(shellcheck/SC2292)
6159
# trunk-ignore(shellcheck/SC2166)

0 commit comments

Comments
 (0)