go/goreleaser
go/goreleaser
1
0
Fork 0
mirror of https://github.com/goreleaser/goreleaser.git synced 2025-01-08 03:31:59 +02:00
Code Issues Releases Activity

fix: nfpm multiple binaries in the same archive (#564)

Browse Source
This commit is contained in:
Carlos Alexandro Becker 2018-02-17 16:51:18 -02:00 committed by GitHub
parent 8c528a90b7
commit ec1ba17102
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pipeline/nfpm/nfpm.go
View File

@ -87,6 +87,18 @@ func create(ctx *context.Context, format, arch string, binaries []artifact.Artif
if err != nil {
return err
}
var files = map[string]string{}
for k, v := range ctx.Config.NFPM.Files {
files[k] = v
}
var log = log.WithField("package", name+"."+format)
for _, binary := range binaries {
src := binary.Path
dst := filepath.Join(ctx.Config.NFPM.Bindir, binary.Name)
log.WithField("src", src).WithField("dst", dst).Debug("adding binary to package")
files[src] = dst
}
log.WithField("files", files).Debug("all archive files")
var info = nfpm.Info{
Arch: arch,
@ -102,19 +114,11 @@ func create(ctx *context.Context, format, arch string, binaries []artifact.Artif
Vendor: ctx.Config.NFPM.Vendor,
Homepage: ctx.Config.NFPM.Homepage,
License: ctx.Config.NFPM.License,
Files: ctx.Config.NFPM.Files,
Bindir: ctx.Config.NFPM.Bindir,
Files: files,
// ConfigFiles: "" TODO: add this config_files to nfpm settings,
}
var log = log.WithField("package", name+"."+format)
for _, binary := range binaries {
src := binary.Path
dst := filepath.Join(ctx.Config.NFPM.Bindir, binary.Name)
log.WithField("src", src).WithField("dst", dst).Info("adding binary to package")
info.Files[src] = dst
}
packager, err := nfpm.Get(format)
if err != nil {
return err

1
pipeline/nfpm/nfpm_test.go
View File

@ -89,6 +89,7 @@ func TestRunPipe(t *testing.T) {
}
}
assert.NoError(t, Pipe{}.Run(ctx))
assert.Empty(t, ctx.Config.NFPM.Files, "should not modify the config file list")
}
func TestInvalidNameTemplate(t *testing.T) {