merge v0.14.11 in (#1808)

gobuffalo · Oct 17, 2019 · dae0f58 · dae0f58
1 parent 66b5250
commit dae0f58
Show file tree

Hide file tree

Showing 13 changed files with 607 additions and 134 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -1,4 +1,4 @@
 # These are supported funding model platforms
 
-github: markbates, stanislas-m, paganotoni, mclark4386
+github: markbates
 patreon: buffalo
diff --git a/Makefile b/Makefile
@@ -3,7 +3,6 @@ GO_BIN ?= go
 
 install: deps
 	make tidy
-	packr2
 	$(GO_BIN) install -tags ${TAGS} -v ./buffalo
 	make tidy
 
@@ -16,26 +15,20 @@ endif
 
 deps:
 	$(GO_BIN) get github.com/gobuffalo/release
-	$(GO_BIN) get github.com/gobuffalo/packr/v2/packr2
-	packr2 clean
 ifneq ($(GO111MODULE),on)
 	$(GO_BIN) get -tags ${TAGS} -u -t ./...
 endif
 	make tidy
 
 build:
-	packr2
 	$(GO_BIN) build -v .
 	make tidy
 
 test:
-	packr2
 	$(GO_BIN) test -tags ${TAGS} -cover ./...
-	packr2
 	make tidy
 
 ci-deps:
-	$(GO_BIN) get -u github.com/gobuffalo/packr/v2/packr2
 	$(GO_BIN) get github.com/gobuffalo/buffalo-pop
 	$(GO_BIN) get -tags ${TAGS} -t -v ./...
 	make tidy
@@ -49,13 +42,11 @@ lint:
 update:
 	$(GO_BIN) get -u -tags ${TAGS}
 	make tidy
-	packr2
 	make test
 	make install
 	make tidy
 
 release-test:
-	make test
 	make tidy
 
 release: