Skip to content

Commit

Permalink
Let go-bindata expand the directory listing rather than bash.
Browse files Browse the repository at this point in the history 
We ran into some oddness with glob expansion ordering, causing
`embedded.go` to have slightly different ordering, and failing in
circle-ci.

The simplest way to get around it is to let go-bindata expand the
directory.
  • Loading branch information
marc committed Jun 15, 2016
1 parent 15bd139 commit be3301d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions ui/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ CSS_TARGET := build/app.css
CSS_DEBUG_TARGET := build/app_debug.css
REMOTE_DEPS := npm.installed bower.installed typings.installed
INDEX := index.html
GOBINDATA_FONTS := ./fonts/*
GOBINDATA_ASSETS := ./assets/*
GOBINDATA_FONTS := ./fonts/
GOBINDATA_ASSETS := ./assets/
GOBINDATA_DEPS := $(TYPESCRIPT_TARGET) $(CSS_TARGET)
GOBINDATA_DEBUG_DEPS := $(TYPESCRIPT_TARGET) $(CSS_DEBUG_TARGET)
GOBINDATA_SOURCES := $(NODE_MODULES)/lodash/lodash.min.js \
Expand Down

2 comments on commit be3301d

@tamird
Copy link
Contributor

@tamird tamird commented on be3301d Jun 15, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The trouble with this is that Make will no longer look at each file in these directories.

@mberhault
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changing one of those files (eg: assets/privacyPolicy.html) already doesn't regenerate anything, so I don't think that's accurate.

Please sign in to comment.