Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: remove empty_folders for good #3163

Merged
merged 2 commits into from
Jun 14, 2022
Merged

feat: remove empty_folders for good #3163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed5300e
feat: remove empty_folders for good
caarlos0 Jun 14, 2022
cb92229
fix: build
caarlos0 Jun 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 6 additions & 10 deletions internal/pipe/nfpm/nfpm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,6 @@ func (Pipe) Default(ctx *context.Context) error {
if fpm.FileNameTemplate == "" {
fpm.FileNameTemplate = defaultNameTemplate
}
if len(fpm.EmptyFolders) > 0 {
deprecate.Notice(ctx, "nfpms.empty_folders")
}
if fpm.Maintainer == "" {
deprecate.NoticeCustom(ctx, "nfpms.maintainer", "`{{ .Property }}` should always be set, check {{ .URL }} for more info")
}
Expand Down Expand Up @@ -256,13 +253,12 @@ func create(ctx *context.Context, fpm config.NFPM, format string, binaries []*ar
Homepage: homepage,
License: fpm.License,
Overridables: nfpm.Overridables{
Conflicts: overridden.Conflicts,
Depends: overridden.Dependencies,
Recommends: overridden.Recommends,
Suggests: overridden.Suggests,
Replaces: overridden.Replaces,
EmptyFolders: overridden.EmptyFolders,
Contents: contents,
Conflicts: overridden.Conflicts,
Depends: overridden.Dependencies,
Recommends: overridden.Recommends,
Suggests: overridden.Suggests,
Replaces: overridden.Replaces,
Contents: contents,
Scripts: nfpm.Scripts{
PreInstall: overridden.Scripts.PreInstall,
PostInstall: overridden.Scripts.PostInstall,
Expand Down
1 change: 0 additions & 1 deletion pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,6 @@ type NFPMOverridables struct {
Suggests []string `yaml:"suggests,omitempty"`
Conflicts []string `yaml:"conflicts,omitempty"`
Replaces []string `yaml:"replaces,omitempty"`
EmptyFolders []string `yaml:"empty_folders,omitempty"` // deprecated
Contents files.Contents `yaml:"contents,omitempty"`
Scripts NFPMScripts `yaml:"scripts,omitempty"`
RPM NFPMRPM `yaml:"rpm,omitempty"`
Expand Down
9 changes: 5 additions & 4 deletions www/docs/deprecations.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,13 @@ On [GoReleaser PRO](/pro/) custom variables should now be prefixed with `.Var`.
some_template: 'lala-{{ .Var.foo }}'
```

## Expired deprecation notices

The following options were deprecated in the past and were already removed.

### nfpms.empty_folders

> since 2021-11-14 (v1.0.0)
> since 2021-11-14 (v1.0.0), removed 2022-06-14 (v1.10.0)

nFPM empty folders is now deprecated in favor of a `dir` content type:

Expand All @@ -115,9 +119,6 @@ nFPM empty folders is now deprecated in favor of a `dir` content type:
type: dir
```

## Expired deprecation notices

The following options were deprecated in the past and were already removed.

### builds for windows/arm64

Expand Down