Skip to content

Make web-asset build step manual. #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juliusv merged 1 commit into from
Oct 4, 2016
+10 −2
Merged

Make web-asset build step manual. #40

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ NETGO_CHECK = @strings $@ | grep cgo_stub\\\.go >/dev/null || { \

ifeq ($(BUILD_IN_CONTAINER),true)

$(EXES) lint test $(STATIC): prism-build/$(UPTODATE)
$(EXES) lint test assets: prism-build/$(UPTODATE)
@mkdir -p $(shell pwd)/.pkg
$(SUDO) docker run $(RM) -ti \
-v $(shell pwd)/.pkg:/go/pkg \
Expand All @@ -63,7 +63,6 @@ $(EXES) lint test $(STATIC): prism-build/$(UPTODATE)
else

$(EXES): prism-build/$(UPTODATE)
go-bindata -pkg ui -o ui/bindata.go -ignore '(.*\.map|bootstrap\.js|bootstrap-theme\.css|bootstrap\.css)' ui/templates/... ui/static/...
go build $(GO_FLAGS) -o $@ ./$(@D)
$(NETGO_CHECK)

Expand All @@ -73,6 +72,15 @@ lint: prism-build/$(UPTODATE)
test: prism-build/$(UPTODATE)
./tools/test -no-go-get

# Manual step that needs to be run after making any changes to the web assets
# (ui/{templates,static}/...).
#
# TODO(juliusv): Figure out if we can make this an automatic part of the build
# process. It currently produces diffs (source file timestamps are getting
# baked into bindata.go) and those make CI fail.
assets: prism-build/$(UPTODATE)
go-bindata -pkg ui -o ui/bindata.go -ignore '(.*\.map|bootstrap\.js|bootstrap-theme\.css|bootstrap\.css)' ui/templates/... ui/static/...

endif

clean:
Expand Down