Fix go-bindata error in Travis build

Based on @sheenobu's work on #58
This commit is contained in:
Matt Baer 2019-04-06 10:44:06 -04:00
parent 24b193df96
commit 8a9ef513fa
3 changed files with 17 additions and 0 deletions

1
.gitignore vendored
View File

@ -3,6 +3,7 @@
*.swo *.swo
build build
tmp
*.ini *.ini
*.db *.db

View File

@ -5,3 +5,5 @@ go:
env: env:
- GO111MODULE=on - GO111MODULE=on
script: make ci

View File

@ -9,9 +9,13 @@ GOGET=$(GOCMD) get
BINARY_NAME=writefreely BINARY_NAME=writefreely
DOCKERCMD=docker DOCKERCMD=docker
IMAGE_NAME=writeas/writefreely IMAGE_NAME=writeas/writefreely
TMPBIN=./tmp
all : build all : build
ci: ci-assets deps
cd cmd/writefreely; $(GOBUILD) -v -tags='sqlite'
build: assets deps build: assets deps
cd cmd/writefreely; $(GOBUILD) -v -tags='sqlite' cd cmd/writefreely; $(GOBUILD) -v -tags='sqlite'
@ -107,8 +111,18 @@ generate :
$(GOGET) -u github.com/jteeuwen/go-bindata/...; \ $(GOGET) -u github.com/jteeuwen/go-bindata/...; \
fi fi
$(TMPBIN):
mkdir -p $(TMPBIN)
$(TMPBIN)/go-bindata: deps $(TMPBIN)
$(GOBUILD) -o $(TMPBIN)/go-bindata github.com/jteeuwen/go-bindata/go-bindata
ci-assets : $(TMPBIN)/go-bindata
$(TMPBIN)/go-bindata -pkg writefreely -ignore=\\.gitignore schema.sql sqlite.sql
clean : clean :
-rm -rf build -rm -rf build
-rm -rf tmp
cd less/; $(MAKE) clean $(MFLAGS) cd less/; $(MAKE) clean $(MFLAGS)
force_look : force_look :