go/goreleaser
go/goreleaser
1
0
Fork 0
mirror of https://github.com/goreleaser/goreleaser.git synced 2025-02-15 13:53:25 +02:00
Code Issues Releases Activity

feat: nfpm: support creating empty folders

Browse Source
This commit is contained in:
Carlos Alexandro Becker 2018-05-16 21:50:13 -03:00 committed by Carlos Alexandro Becker
parent 5252f74ade
commit e165058098
5 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Gopkg.lock generated
View File

@ -137,8 +137,8 @@
"glob", "glob",
"rpm" "rpm"
] ]
revision = "8faa8e2e621115b3b560688a72d9c37bff4acb9f" revision = "d2eaeef92bdb3ead4ee45852b10b81f4c650f4fc"
version = "v0.8.2" version = "v0.9.0"
[[projects]] [[projects]]
name = "github.com/imdario/mergo" name = "github.com/imdario/mergo"
@ -258,6 +258,6 @@
[solve-meta] [solve-meta]
analyzer-name = "dep" analyzer-name = "dep"
analyzer-version = 1 analyzer-version = 1
inputs-digest = "3fac5f0b013f4e66674db9d8ac7781f82ffdb4d46e3e004cfab2728b78c37a84" inputs-digest = "f8fe5bd56d1929f1592ca556cb199eec1d49bbc99d1b1cd5796a9a2be7d6bb22"
solver-name = "gps-cdcl" solver-name = "gps-cdcl"
solver-version = 1 solver-version = 1

2
Gopkg.toml
View File

@ -48,7 +48,7 @@
[[constraint]] [[constraint]]
name = "github.com/goreleaser/nfpm" name = "github.com/goreleaser/nfpm"
version = "~0.8.0" version = "~0.9.0"
[[constraint]] [[constraint]]
name = "github.com/alecthomas/kingpin" name = "github.com/alecthomas/kingpin"

1
config/config.go
View File

@ -189,6 +189,7 @@ type NFPMOverridables struct {
Recommends []string `yaml:",omitempty"` Recommends []string `yaml:",omitempty"`
Suggests []string `yaml:",omitempty"` Suggests []string `yaml:",omitempty"`
Conflicts []string `yaml:",omitempty"` Conflicts []string `yaml:",omitempty"`
EmptyFolders []string `yaml:"empty_folders,omitempty"`
Files map[string]string `yaml:",omitempty"` Files map[string]string `yaml:",omitempty"`
ConfigFiles map[string]string `yaml:"config_files,omitempty"` ConfigFiles map[string]string `yaml:"config_files,omitempty"`
Scripts NFPMScripts `yaml:"scripts,omitempty"` Scripts NFPMScripts `yaml:"scripts,omitempty"`

13
pipeline/nfpm/nfpm.go
View File

@ -135,12 +135,13 @@ func create(ctx *context.Context, format, arch string, binaries []artifact.Artif
License: ctx.Config.NFPM.License, License: ctx.Config.NFPM.License,
Bindir: ctx.Config.NFPM.Bindir, Bindir: ctx.Config.NFPM.Bindir,
Overridables: nfpm.Overridables{ Overridables: nfpm.Overridables{
Conflicts: overrided.Conflicts, Conflicts: overrided.Conflicts,
Depends: overrided.Dependencies, Depends: overrided.Dependencies,
Recommends: overrided.Recommends, Recommends: overrided.Recommends,
Suggests: overrided.Suggests, Suggests: overrided.Suggests,
Files: files, EmptyFolders: overrided.EmptyFolders,
ConfigFiles: overrided.ConfigFiles, Files: files,
ConfigFiles: overrided.ConfigFiles,
Scripts: nfpm.Scripts{ Scripts: nfpm.Scripts{
PreInstall: overrided.Scripts.PreInstall, PreInstall: overrided.Scripts.PreInstall,
PostInstall: overrided.Scripts.PostInstall, PostInstall: overrided.Scripts.PostInstall,

1
pipeline/nfpm/nfpm_test.go
View File

@ -84,6 +84,7 @@ func TestRunPipe(t *testing.T) {
Recommends: []string{"svn"}, Recommends: []string{"svn"},
Suggests: []string{"bzr"}, Suggests: []string{"bzr"},
Conflicts: []string{"git"}, Conflicts: []string{"git"},
EmptyFolders: []string{"/var/log/foobar"},
Files: map[string]string{ Files: map[string]string{
"./testdata/testfile.txt": "/usr/share/testfile.txt", "./testdata/testfile.txt": "/usr/share/testfile.txt",
}, },