From b180386d23226ebfcdb4e1e2dc1ede2cf8876708 Mon Sep 17 00:00:00 2001 From: Deluan Date: Sat, 1 May 2021 09:16:45 -0400 Subject: [PATCH] Simplify build targets --- Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 7fd2f906..f14ced06 100644 --- a/Makefile +++ b/Makefile @@ -4,9 +4,8 @@ NODE_VERSION=$(shell cat .nvmrc) GIT_SHA=$(shell git rev-parse --short HEAD) GIT_TAG=$(shell git describe --tags `git rev-list --tags --max-count=1`) -## Default target just build the Go project. -default: - go build -ldflags="-X github.com/navidrome/navidrome/consts.gitSha=$(GIT_SHA) -X github.com/navidrome/navidrome/consts.gitTag=master" +## Default target just build the project. +default: buildall .PHONY: default dev: check_env @@ -94,12 +93,14 @@ check_node_env: .PHONY: check_node_env build: check_go_env - go build -ldflags="-X github.com/navidrome/navidrome/consts.gitSha=$(GIT_SHA) -X github.com/navidrome/navidrome/consts.gitTag=$(GIT_TAG)-SNAPSHOT" + go build -ldflags="-X github.com/navidrome/navidrome/consts.gitSha=$(GIT_SHA) -X github.com/navidrome/navidrome/consts.gitTag=$(GIT_TAG)-SNAPSHOT" -tags=netgo .PHONY: build -buildall: check_go_env +buildjs: check_node_env @(cd ./ui && npm run build) - go build -ldflags="-X github.com/navidrome/navidrome/consts.gitSha=$(GIT_SHA) -X github.com/navidrome/navidrome/consts.gitTag=$(GIT_TAG)-SNAPSHOT" -tags=netgo +.PHONY: buildjs + +buildall: buildjs build .PHONY: buildall pre-push: lintall testall