feat: remove deprecated brew config (#1313)

* feat: remove deprecated brew config Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com> * fix: wording Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com> * fix: wording Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com> * fix: defaults Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com> * fix: defaults Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com> * fix: defaults Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com>
goreleaser · Jan 26, 2020 · 4797981 · 4797981
1 parent 3bfb363
commit 4797981
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 16 deletions.
diff --git a/internal/pipe/brew/brew.go b/internal/pipe/brew/brew.go
@@ -7,14 +7,12 @@ import (
 	"io/ioutil"
 	"path"
 	"path/filepath"
-	"reflect"
 	"strings"
 	"text/template"
 
 	"github.com/apex/log"
 	"github.com/goreleaser/goreleaser/internal/artifact"
 	"github.com/goreleaser/goreleaser/internal/client"
-	"github.com/goreleaser/goreleaser/internal/deprecate"
 	"github.com/goreleaser/goreleaser/internal/pipe"
 	"github.com/goreleaser/goreleaser/internal/tmpl"
 	"github.com/goreleaser/goreleaser/pkg/config"
@@ -54,12 +52,6 @@ func (Pipe) Publish(ctx *context.Context) error {
 
 // Default sets the pipe defaults
 func (Pipe) Default(ctx *context.Context) error {
-	if len(ctx.Config.Brews) == 0 {
-		ctx.Config.Brews = append(ctx.Config.Brews, ctx.Config.Brew)
-		if !reflect.DeepEqual(ctx.Config.Brew, config.Homebrew{}) {
-			deprecate.Notice("brew")
-		}
-	}
 	for i := range ctx.Config.Brews {
 		var brew = &ctx.Config.Brews[i]
 		if brew.Install == "" {

diff --git a/internal/pipe/brew/brew_test.go b/internal/pipe/brew/brew_test.go
@@ -686,7 +686,9 @@ func TestDefault(t *testing.T) {
 		TokenType: context.TokenTypeGitHub,
 		Config: config.Project{
 			ProjectName: "myproject",
-			Brews:       []config.Homebrew{},
+			Brews: []config.Homebrew{
+				{},
+			},
 			Builds: []config.Build{
 				{
 					Binary: "foo",

diff --git a/internal/pipe/defaults/defaults_test.go b/internal/pipe/defaults/defaults_test.go
@@ -36,7 +36,6 @@ func TestFillBasicData(t *testing.T) {
 	assert.Contains(t, ctx.Config.Builds[0].Goarch, "386")
 	assert.Contains(t, ctx.Config.Builds[0].Goarch, "amd64")
 	assert.Equal(t, "tar.gz", ctx.Config.Archives[0].Format)
-	assert.Contains(t, ctx.Config.Brews[0].Install, "bin.install \"goreleaser\"")
 	assert.Empty(t, ctx.Config.Dockers)
 	assert.Equal(t, "https://github.com", ctx.Config.GitHubURLs.Download)
 	assert.NotEmpty(t, ctx.Config.Archives[0].NameTemplate)
@@ -89,6 +88,11 @@ func TestFillPartial(t *testing.T) {
 					ImageTemplates: []string{"a/b"},
 				},
 			},
+			Brews: []config.Homebrew{
+				{
+					Description: "foo",
+				},
+			},
 		},
 	}
 	assert.NoError(t, Pipe{}.Run(ctx))

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -345,7 +345,6 @@ type Project struct {
 	ProjectName   string      `yaml:"project_name,omitempty"`
 	Env           []string    `yaml:",omitempty"`
 	Release       Release     `yaml:",omitempty"`
-	Brew          Homebrew    `yaml:",omitempty"` // TODO: remove this
 	Brews         []Homebrew  `yaml:",omitempty"`
 	Scoop         Scoop       `yaml:",omitempty"`
 	Builds        []Build     `yaml:",omitempty"`

diff --git a/www/content/deprecations.md b/www/content/deprecations.md
@@ -129,10 +129,13 @@ signs:
     # etc
 ```
 
+## Expired deprecation notices
+
+The following options were deprecated for ~6 months and are now fully removed.
 
 ### brew
 
-> since 2019-06-09
+> since 2019-06-09, removed 2020-01-26
 
 Brew was deprecated in favor of its plural form.
 
@@ -151,10 +154,6 @@ brews:
     # etc
 ```
 
-## Expired deprecation notices
-
-The following options were deprecated for ~6 months and are now fully removed.
-
 ### s3
 
 > since 2019-06-09, removed 2020-01-07