go/goreleaser
1
0
Fork 0
mirror of https://github.com/goreleaser/goreleaser.git synced 2025-11-06 09:09:29 +02:00
Code Issues Releases Activity

fix(archive): always strip parent if set (#3256)

Browse Source 
* Always strip parents.

* refactor: improve code a bit

Signed-off-by: Carlos A Becker <caarlos0@users.noreply.github.com>

* refactor: even simpler

Signed-off-by: Carlos A Becker <caarlos0@users.noreply.github.com>

Co-authored-by: Nathan Hammond <nathan.hammond@vercel.com>
This commit is contained in:
Carlos Alexandro Becker
2022-07-27 09:55:55 -03:00
committed by GitHub
parent a02bcef337
commit 315935aedc
3 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
internal/archivefiles/archivefiles.go
View File

@@ -64,9 +64,6 @@ func unique(in []config.File) []config.File {
} }
func destinationFor(f config.File, path string) string { func destinationFor(f config.File, path string) string {
if f.Destination == "" {
return path
}
if f.StripParent { if f.StripParent {
return filepath.Join(f.Destination, filepath.Base(path)) return filepath.Join(f.Destination, filepath.Base(path))
} }

20
internal/archivefiles/archivefiles_test.go
View File

@@ -31,6 +31,26 @@ func TestEval(t *testing.T) {
}, result) }, result)
}) })
t.Run("strip parent plays nicely with destination omitted", func(t *testing.T) {
result, err := Eval(tmpl, []config.File{{Source: "./testdata/a/b", StripParent: true}})
require.NoError(t, err)
require.Equal(t, []config.File{
{Source: "testdata/a/b/a.txt", Destination: "a.txt"},
{Source: "testdata/a/b/c/d.txt", Destination: "d.txt"},
}, result)
})
t.Run("strip parent plays nicely with destination as an empty string", func(t *testing.T) {
result, err := Eval(tmpl, []config.File{{Source: "./testdata/a/b", Destination: "", StripParent: true}})
require.NoError(t, err)
require.Equal(t, []config.File{
{Source: "testdata/a/b/a.txt", Destination: "a.txt"},
{Source: "testdata/a/b/c/d.txt", Destination: "d.txt"},
}, result)
})
t.Run("match multiple files within tree without destination", func(t *testing.T) { t.Run("match multiple files within tree without destination", func(t *testing.T) {
result, err := Eval(tmpl, []config.File{{Source: "./testdata/a"}}) result, err := Eval(tmpl, []config.File{{Source: "./testdata/a"}})

3
www/docs/customization/archive.md
View File

@@ -142,9 +142,6 @@ files:
# ... # ...
``` ```
!!! warning
`strip_parent` is only effective if `dst` is not empty.
## Packaging only the binaries ## Packaging only the binaries
Since GoReleaser will always add the `README` and `LICENSE` files to the Since GoReleaser will always add the `README` and `LICENSE` files to the