Update build files

Author: calebdw

Dockerfile

@@ -15,7 +15,8 @@ WORKDIR /app
 
 COPY config/west.yml config/west.yml
 
-RUN west init -l config \
+RUN mkdir -p build \
+    && west init -l config \
     && west update \
     && west zephyr-export
 

Makefile

@@ -3,20 +3,20 @@ DOCKER := $(shell { command -v podman || command -v docker; })
 .PHONY: all clean distclean
 
 all:
-	$(DOCKER) zmk_build --tag zmk-config --build-arg USER_ID=$(shell id -u) .
-	$(DOCKER) volume create zmk_app
-	$(DOCKER) run --rm -it --name zmk-config -u zmk \
-		-v zmk_app:/app \
+	$(DOCKER) build --tag zmk-build-user-config --build-arg USER_ID=$(shell id -u) .
+	$(DOCKER) volume create zmk_build
+	$(DOCKER) run --rm -it --name zmk-build-user-config -u zmk \
+		-v zmk_build:/app/build \
 		-v $(PWD)/build.yaml:/app/build.yaml:ro \
 		-v $(PWD)/config:/app/config:ro \
 		-v $(PWD)/firmware:/app/firmware \
 		-e OUTPUT_ZMK_CONFIG=$(OUTPUT_ZMK_CONFIG) \
-		zmk-config
+		zmk-build-user-config
 
 clean:
 	rm -rf firmware/[^.]*
-	-$(DOCKER) volume rm build config firmware
-	-$(DOCKER) volume rm zmk_app
+	-$(DOCKER) volume rm zmk_build
 
 distclean: clean
-	-$(DOCKER) image rm zmk-config
+	-$(DOCKER) image rm zmk-build-user-config
+	-$(DOCKER) system prune

README.md

@@ -48,7 +48,7 @@ OUTPUT_ZMK_CONFIG=1 make
 The configs with then be outputted to the `firmware` directory along with the firmware files.
 
 #### Build Cache
-A docker volume is used to cache the build artifacts, this allows subsequent builds to compile faster.
+A docker volume is used to cache the build artifacts, allowing subsequent builds to compile faster.
 
 ### Cleanup
 

bin/build.sh

@@ -6,8 +6,8 @@ timestamp=$(date -u +"%Y%m%d%H%M%S")
 while IFS=$',' read -r board shield; do
     extra_cmake_args=${shield:+-DSHIELD="$shield"}
     artifact_name=${shield:+${shield// /-}-}${board}-zmk
-    filename="firmware/${timestamp}-${artifact_name}"
-    build_dir="build/${artifact_name}"
+    filename="${PWD}/firmware/${timestamp}-${artifact_name}"
+    build_dir="${PWD}/build/${artifact_name}"
 
     echo ""
     echo "-----------------"
@@ -30,7 +30,14 @@ while IFS=$',' read -r board shield; do
             | sort > "${filename}.config"
     fi
 
-    cp ${build_dir}/zephyr/zmk.uf2 "${filename}.uf2"
+    extensions="uf2 hex bin"
+    for extension in $extensions; do
+        artifact=${build_dir}/zephyr/zmk.$extension
+        if [[ -f $artifact ]]; then
+            cp $artifact "${filename}.$extension"
+            break
+        fi
+    done
 done < <(yq '
     [{"board": .board[], "shield": .shield[] // ""}] + .include
     | filter(.board)