Skip to content
This repository has been archived by the owner on Feb 24, 2024. It is now read-only.

use the new buffalo-cli module #1780

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
File renamed without changes.
57 changes: 27 additions & 30 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
TAGS ?= "sqlite"
GO_BIN ?= go
TAGS ?= ""
GO_BIN ?= "go"

install: deps
make tidy
packr2
install:
$(GO_BIN) install -tags ${TAGS} -v ./buffalo
make tidy

Expand All @@ -15,50 +13,49 @@ else
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
$(GO_BIN) get -tags ${TAGS} -t ./...
make tidy

build:
packr2
build:
$(GO_BIN) build -v .
make tidy

test:
packr2
$(GO_BIN) test -tags ${TAGS} -cover ./...
packr2
test:
$(GO_BIN) test -cover -tags ${TAGS} ./...
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
ci-deps:
$(GO_BIN) get -tags ${TAGS} -t ./...

ci-test:
docker build . --no-cache --build-arg TRAVIS_BRANCH=$$(git symbolic-ref --short HEAD)
ci-test:
$(GO_BIN) test -tags ${TAGS} -race ./...

lint:
golangci-lint --vendor ./... --deadline=1m --skip=internal
go get github.com/golangci/golangci-lint/cmd/golangci-lint
golangci-lint run --enable-all
make tidy

update:
ifeq ($(GO111MODULE),on)
rm go.*
$(GO_BIN) mod init
$(GO_BIN) mod tidy
else
$(GO_BIN) get -u -tags ${TAGS}
make tidy
packr2
endif
make test
make install
make tidy

release-test:
make test
release-test:
$(GO_BIN) test -tags ${TAGS} -race ./...
make tidy

release:
$(GO_BIN) get github.com/gobuffalo/release
make tidy
release -y -f ./runtime/version.go --skip-packr
release -y -f version.go --skip-packr
make tidy



1 change: 0 additions & 1 deletion app.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ func (a *App) Muxer() *mux.Router {

// New returns a new instance of App and adds some sane, and useful, defaults.
func New(opts Options) *App {
LoadPlugins()
envy.Load()

opts = optionsWithDefaults(opts)
Expand Down
42 changes: 13 additions & 29 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -1,36 +1,26 @@
variables:
GOPROXY: "https://proxy.golang.org"
GOBIN: "$(GOPATH)/bin" # Go binaries path
GOPATH: "$(system.defaultWorkingDirectory)/gopath" # Go workspace path
GOPROXY: "https://proxy.golang.org"
modulePath: "$(GOPATH)/src/github.com/$(build.repository.name)" # Path to the module"s code

jobs:
- job: IntegrationTests
pool:
vmImage: "ubuntu-16.04"
steps:
- script: docker build .
displayName: "Integration Tests"

- job: Windows
pool:
vmImage: "vs2017-win2016"
strategy:
matrix:
go 1.10:
go_version: "1.10"
GO111MODULE: "off"
go 1.11 (on):
go_version: "1.11.5"
go_version: "1.11.13"
GO111MODULE: "on"
go 1.11 (off):
go_version: "1.11.5"
go_version: "1.11.13"
GO111MODULE: "off"
go 1.12 (on):
go_version: "1.12"
go_version: "1.12.9"
GO111MODULE: "on"
go 1.12 (off):
go_version: "1.12"
go_version: "1.12.9"
GO111MODULE: "off"
steps:
- template: azure-tests.yml
Expand All @@ -40,20 +30,17 @@ jobs:
vmImage: "macOS-10.13"
strategy:
matrix:
go 1.10:
go_version: "1.10"
GO111MODULE: "off"
go 1.11 (on):
go_version: "1.11.5"
go_version: "1.11.13"
GO111MODULE: "on"
go 1.11 (off):
go_version: "1.11.5"
go_version: "1.11.13"
GO111MODULE: "off"
go 1.12 (on):
go_version: "1.12"
go_version: "1.12.9"
GO111MODULE: "on"
go 1.12 (off):
go_version: "1.12"
go_version: "1.12.9"
GO111MODULE: "off"
steps:
- template: azure-tests.yml
Expand All @@ -63,20 +50,17 @@ jobs:
vmImage: "ubuntu-16.04"
strategy:
matrix:
go 1.10:
go_version: "1.10"
GO111MODULE: "off"
go 1.11 (on):
go_version: "1.11.5"
go_version: "1.11.13"
GO111MODULE: "on"
go 1.11 (off):
go_version: "1.11.5"
go_version: "1.11.13"
GO111MODULE: "off"
go 1.12 (on):
go_version: "1.12"
go_version: "1.12.9"
GO111MODULE: "on"
go 1.12 (off):
go_version: "1.12"
go_version: "1.12.9"
GO111MODULE: "off"
steps:
- template: azure-tests.yml
2 changes: 1 addition & 1 deletion azure-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ steps:
mv !(gopath) "$(modulePath)"
displayName: "Setup Go Workspace"
- script: |
go get -tags "sqlite integration_test" -t -v ./...
go get -t -tags "sqlite integration_test" -v ./...
go test -tags "sqlite integration_test" -race ./...
workingDirectory: "$(modulePath)"
displayName: "Tests"
160 changes: 0 additions & 160 deletions buffalo/cmd/build.go

This file was deleted.

24 changes: 0 additions & 24 deletions buffalo/cmd/destroy.go

This file was deleted.

Loading