Skip to content

Commit

Permalink
Fix local builds
Browse files Browse the repository at this point in the history
makefile doesn't like the script returning the macro, directed to null for local builds as version.dtsi file accessible
  • Loading branch information
ReFil committed Nov 15, 2023
1 parent 7316766 commit e6be965
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ endif
.PHONY: all clean

all:
$(shell bin/get_version.sh)
$(shell bin/get_version.sh >> /dev/null)
$(DOCKER) build --tag zmk --file Dockerfile .
$(DOCKER) run --rm -it --name zmk \
-v $(PWD)/firmware:/app/firmware$(SELINUX1) \
Expand Down
4 changes: 2 additions & 2 deletions bin/get_version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

# Get the date, first 4 chars of branch name and short commit hash
date=$(date -u +"%Y%m%d")
branch=${1:-(git rev-parse --abbrev-ref HEAD | cut -c1-4)}
commit=${2:-(git rev-parse --short HEAD)}
branch=${1:-$(git rev-parse --abbrev-ref HEAD | cut -c1-4)}
commit=${2:-$(git rev-parse --short HEAD)}

# Function to transform characters to ZMK key behaviours
transform_char() {
Expand Down

0 comments on commit e6be965

Please sign in to comment.