Revert "fix: skip defaults for skipped pipes (#4210)"

This reverts commit dccd68c126.

This breaks `continue` on goreleaser-pro.

Will re-work this for the next release.
This commit is contained in:
Carlos Alexandro Becker
2023-08-09 02:43:34 +00:00
parent dccd68c126
commit 08e307ea8d
3 changed files with 2 additions and 7 deletions
+1 -5
View File
@@ -8,7 +8,6 @@ import (
"github.com/goreleaser/goreleaser/internal/client"
"github.com/goreleaser/goreleaser/internal/middleware/errhandler"
"github.com/goreleaser/goreleaser/internal/middleware/skip"
"github.com/goreleaser/goreleaser/internal/tmpl"
"github.com/goreleaser/goreleaser/pkg/context"
"github.com/goreleaser/goreleaser/pkg/defaults"
@@ -39,10 +38,7 @@ func (Pipe) Run(ctx *context.Context) error {
ctx.Config.GiteaURLs.Download = strings.TrimSuffix(strings.ReplaceAll(apiURL, "/api/v1", ""), "/")
}
for _, defaulter := range defaults.Defaulters {
if err := skip.Maybe(
defaulter,
errhandler.Handle(defaulter.Default),
)(ctx); err != nil {
if err := errhandler.Handle(defaulter.Default)(ctx); err != nil {
return err
}
}
-1
View File
@@ -94,7 +94,6 @@ func TestFillPartial(t *testing.T) {
require.NotEmpty(t, ctx.Config.Dockers[0].Dockerfile)
require.Equal(t, "disttt", ctx.Config.Dist)
require.NotEqual(t, "https://github.com", ctx.Config.GitHubURLs.Download)
require.Empty(t, ctx.Config.Nix, "nix should have been skipped")
ctx = testctx.NewWithCfg(config.Project{
GiteaURLs: config.GiteaURLs{
+1 -1
View File
@@ -80,7 +80,7 @@ var Defaulters = []Defaulter{
blob.Pipe{},
upload.Pipe{},
aur.Pipe{},
nix.NewPublish(),
nix.Pipe{},
winget.Pipe{},
brew.Pipe{},
krew.Pipe{},