Skip to content

Commit

Permalink
updates a few things
Browse files Browse the repository at this point in the history
  • Loading branch information
@markbates
markbates committed Aug 29, 2019
1 parent a764fbf commit b1581ad
Show file tree
Hide file tree
Showing 7 changed files with 43 additions and 35 deletions.
25 changes: 13 additions & 12 deletions azure-pipelines.yml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
variables:
GOPROXY: "https://proxy.golang.org"
GOBIN: "$(GOPATH)/bin" # Go binaries path
GOPATH: "$(system.defaultWorkingDirectory)/gopath" # Go workspace path
modulePath: "$(GOPATH)/src/github.com/$(build.repository.name)" # Path to the module"s code
Expand All @@ -10,16 +11,16 @@ jobs:
strategy:
matrix:
go 1.11 (on):
go_version: "1.11.11"
go_version: "1.11.13"
GO111MODULE: "on"
go 1.11 (off):
go_version: "1.11.11"
go_version: "1.11.13"
GO111MODULE: "off"
go 1.12 (on):
go_version: "1.12.6"
go_version: "1.12.9"
GO111MODULE: "on"
go 1.12 (off):
go_version: "1.12.6"
go_version: "1.12.9"
GO111MODULE: "off"
steps:
- template: azure-tests.yml
Expand All @@ -30,16 +31,16 @@ jobs:
strategy:
matrix:
go 1.11 (on):
go_version: "1.11.11"
go_version: "1.11.13"
GO111MODULE: "on"
go 1.11 (off):
go_version: "1.11.11"
go_version: "1.11.13"
GO111MODULE: "off"
go 1.12 (on):
go_version: "1.12.6"
go_version: "1.12.9"
GO111MODULE: "on"
go 1.12 (off):
go_version: "1.12.6"
go_version: "1.12.9"
GO111MODULE: "off"
steps:
- template: azure-tests.yml
Expand All @@ -50,16 +51,16 @@ jobs:
strategy:
matrix:
go 1.11 (on):
go_version: "1.11.11"
go_version: "1.11.13"
GO111MODULE: "on"
go 1.11 (off):
go_version: "1.11.11"
go_version: "1.11.13"
GO111MODULE: "off"
go 1.12 (on):
go_version: "1.12.6"
go_version: "1.12.9"
GO111MODULE: "on"
go 1.12 (off):
go_version: "1.12.6"
go_version: "1.12.9"
GO111MODULE: "off"
steps:
- template: azure-tests.yml
25 changes: 13 additions & 12 deletions genny/azure/templates/azure-pipelines.yml.plush
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
variables:
GOPROXY: "https://proxy.golang.org"
GOBIN: "$(GOPATH)/bin" # Go binaries path
GOPATH: "$(system.defaultWorkingDirectory)/gopath" # Go workspace path
modulePath: "$(GOPATH)/src/github.com/$(build.repository.name)" # Path to the module"s code
Expand All @@ -10,16 +11,16 @@ jobs:
strategy:
matrix:
go 1.11 (on):
go_version: "1.11.11"
go_version: "1.11.13"
GO111MODULE: "on"
go 1.11 (off):
go_version: "1.11.11"
go_version: "1.11.13"
GO111MODULE: "off"
go 1.12 (on):
go_version: "1.12.6"
go_version: "1.12.9"
GO111MODULE: "on"
go 1.12 (off):
go_version: "1.12.6"
go_version: "1.12.9"
GO111MODULE: "off"
steps:
- template: azure-tests.yml
Expand All @@ -30,16 +31,16 @@ jobs:
strategy:
matrix:
go 1.11 (on):
go_version: "1.11.11"
go_version: "1.11.13"
GO111MODULE: "on"
go 1.11 (off):
go_version: "1.11.11"
go_version: "1.11.13"
GO111MODULE: "off"
go 1.12 (on):
go_version: "1.12.6"
go_version: "1.12.9"
GO111MODULE: "on"
go 1.12 (off):
go_version: "1.12.6"
go_version: "1.12.9"
GO111MODULE: "off"
steps:
- template: azure-tests.yml
Expand All @@ -50,16 +51,16 @@ jobs:
strategy:
matrix:
go 1.11 (on):
go_version: "1.11.11"
go_version: "1.11.13"
GO111MODULE: "on"
go 1.11 (off):
go_version: "1.11.11"
go_version: "1.11.13"
GO111MODULE: "off"
go 1.12 (on):
go_version: "1.12.6"
go_version: "1.12.9"
GO111MODULE: "on"
go 1.12 (off):
go_version: "1.12.6"
go_version: "1.12.9"
GO111MODULE: "off"
steps:
- template: azure-tests.yml
4 changes: 1 addition & 3 deletions genny/git/templates/-dot-gitignore.plush
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
doc
tmp
pkg
*.gem
*.pid
coverage
coverage.data
Expand All @@ -14,8 +13,6 @@ build/*
profile
.console_history
.sass-cache/*
.rake_tasks~
*.log.lck
solr/
.jhw-cache/
jhw.*
Expand All @@ -27,3 +24,4 @@ generated/
bin/*
gin-bin
.idea/
.vscode
11 changes: 8 additions & 3 deletions genny/goreleaser/options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ package goreleaser

import (
"fmt"
"os/user"
"path"
"path/filepath"

"github.com/gobuffalo/here"
)

type Options struct {
Expand All @@ -28,11 +30,14 @@ func (opts *Options) Validate() error {
}

if len(opts.BrewOwner) == 0 {
user, err := user.Current()
info, err := here.Current()
if err != nil {
return err
}
opts.BrewOwner = user.Username

name := path.Dir(info.ImportPath)
opts.BrewOwner = path.Base(name)

}
if len(opts.MainFile) > 0 {
if filepath.Ext(opts.MainFile) != ".go" {
Expand Down
3 changes: 2 additions & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ require (
github.com/Masterminds/semver v1.4.2
github.com/gobuffalo/envy v1.7.0
github.com/gobuffalo/genny v0.3.0
github.com/gobuffalo/here v0.2.3
github.com/gobuffalo/licenser v1.2.0
github.com/gobuffalo/logger v1.0.0
github.com/gobuffalo/packr/v2 v2.5.2
github.com/gobuffalo/packr/v2 v2.6.0
github.com/gobuffalo/plush v3.8.2+incompatible
github.com/gobuffalo/shoulders v1.1.0
github.com/spf13/cobra v0.0.5
Expand Down
6 changes: 4 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ github.com/gobuffalo/github_flavored_markdown v1.1.0/go.mod h1:TSpTKWcRTI0+v7W3x
github.com/gobuffalo/gogen v0.2.0/go.mod h1:V9QVDIxsgKNZs6L2IYiGR8datgMhB577vzTDqypH360=
github.com/gobuffalo/helpers v0.2.2 h1:AAu+rUINhzIii77xzuih26Q0ZJgOcLkf37FaBcv2diU=
github.com/gobuffalo/helpers v0.2.2/go.mod h1:xYbzUdCUpVzLwLnqV8HIjT6hmG0Cs7YIBCJkNM597jw=
github.com/gobuffalo/here v0.2.3 h1:1xamq7i4CKjGgICCXY0qpxPeXGdB8oVNSevkpqwd5X4=
github.com/gobuffalo/here v0.2.3/go.mod h1:2a6G14FaAKOGJMK/5UNa4Og/+iyFS5cq3MnlvFR7YDk=
github.com/gobuffalo/licenser v1.2.0 h1:nHodbRRk7aO44QqSGCxoSuazdJWOr9pr4txNuhmzbng=
github.com/gobuffalo/licenser v1.2.0/go.mod h1:ZqDQ+UOqsXPovl65rbCr3Tye6+nKjT4ovwurjVxvMQM=
github.com/gobuffalo/logger v0.0.0-20190315122211-86e12af44bc2/go.mod h1:QdxcLw541hSGtBnhUc4gaNIXRjiDppFGaDqzbrBd3v8=
Expand All @@ -40,8 +42,8 @@ github.com/gobuffalo/packd v0.2.0/go.mod h1:k2CkHP3bjbqL2GwxwhxUy1DgnlbW644hkLC9
github.com/gobuffalo/packd v0.3.0 h1:eMwymTkA1uXsqxS0Tpoop3Lc0u3kTfiMBE6nKtQU4g4=
github.com/gobuffalo/packd v0.3.0/go.mod h1:zC7QkmNkYVGKPw4tHpBQ+ml7W/3tIebgeo1b36chA3Q=
github.com/gobuffalo/packr/v2 v2.4.0/go.mod h1:ra341gygw9/61nSjAbfwcwh8IrYL4WmR4IsPkPBhQiY=
github.com/gobuffalo/packr/v2 v2.5.2 h1:4EvjeIpQLZuRIljwnidYgbRXbr1yIzVRrESiLjqKj6s=
github.com/gobuffalo/packr/v2 v2.5.2/go.mod h1:sgEE1xNZ6G0FNN5xn9pevVu4nywaxHvgup67xisti08=
github.com/gobuffalo/packr/v2 v2.6.0 h1:EMUzJIb5rof6r087PtGmgdzdLKpRBESJ/8jyL9MexfY=
github.com/gobuffalo/packr/v2 v2.6.0/go.mod h1:sgEE1xNZ6G0FNN5xn9pevVu4nywaxHvgup67xisti08=
github.com/gobuffalo/plush v3.8.2+incompatible h1:EXtDf5L7TTwX8tEddtdHT+PT2lFerIKQm8Ye/M7O+54=
github.com/gobuffalo/plush v3.8.2+incompatible/go.mod h1:rQ4zdtUUyZNqULlc6bqd5scsPfLKfT0+TGMChgduDvI=
github.com/gobuffalo/plushgen v0.1.2/go.mod h1:3U71v6HWZpVER1nInTXeAwdoRNsRd4W8aeIa1Lyp+Bk=
Expand Down
Loading

0 comments on commit b1581ad

Please sign in to comment.