Q repro build

This commit is contained in:
Peter D. Gray 2024-02-02 10:37:40 -05:00
parent 104dd842a3
commit 14387d1d71
No known key found for this signature in database
GPG Key ID: A2DCD558C2BE5D7C
2 changed files with 7 additions and 6 deletions

View File

@ -8,11 +8,12 @@ set -ex
# arguments, all required
VERSION_STRING=$1
MK_NUM=$2
HW_MODEL=$2
PARENT_MKFILE=$3
VENV_PATH="/tmp/ENV"
MAKE="make -f MK$MK_NUM-Makefile"
MAKE="make -f $PARENT_MKFILE"
TARGETS="firmware-signed.bin firmware-signed.dfu production.bin dev.dfu firmware.lss firmware.elf"
@ -41,12 +42,12 @@ python -m pip install --editable .
cd ../stm32
cd ../releases
if [ -f *-v$VERSION_STRING-mk$MK_NUM-coldcard.dfu ]; then
if [ -f *-v$VERSION_STRING-$HW_MODEL-coldcard.dfu ]; then
echo "Using existing binary in ../releases, not downloading."
PUBLISHED_BIN=`realpath *-v$VERSION_STRING-mk$MK_NUM-coldcard.dfu`
PUBLISHED_BIN=`realpath *-v$VERSION_STRING-$HW_MODEL-coldcard.dfu`
else
# fetch a copy of the required binary
PUBLISHED_BIN=`grep -F v$VERSION_STRING-mk$MK_NUM-coldcard.dfu signatures.txt | dd bs=66 skip=1`
PUBLISHED_BIN=`grep -F v$VERSION_STRING-$HW_MODEL-coldcard.dfu signatures.txt | dd bs=66 skip=1`
if [ -z "$PUBLISHED_BIN" ]; then
# may indicate first attempt to build this release
echo "Cannot determine release date / full file name."

View File

@ -242,7 +242,7 @@ DOCK_RUN_ARGS = -v $(realpath ..):/work/src:ro \
repro: code-committed
repro:
docker build -t coldcard-build - < dockerfile.build
(cd ..; docker run $(DOCK_RUN_ARGS) sh src/stm32/repro-build.sh $(VERSION_STRING) $(HW_MODEL))
(cd ..; docker run $(DOCK_RUN_ARGS) sh src/stm32/repro-build.sh $(VERSION_STRING) $(HW_MODEL) $(PARENT_MKFILE))
# debug: shell into docker container
shell: