From e0a21a1f5d8989f45b58ae6a8a4e6a5924c2bd75 Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Sat, 2 Nov 2024 15:08:58 -0300 Subject: [PATCH] fix(nfpm): bad filename for 386 Signed-off-by: Carlos Alexandro Becker --- internal/pipe/nfpm/nfpm.go | 4 ++-- internal/pipe/nfpm/nfpm_test.go | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/internal/pipe/nfpm/nfpm.go b/internal/pipe/nfpm/nfpm.go index e9e051914..f60bbb0f2 100644 --- a/internal/pipe/nfpm/nfpm.go +++ b/internal/pipe/nfpm/nfpm.go @@ -180,8 +180,8 @@ var termuxArchReplacer = strings.NewReplacer( func create(ctx *context.Context, fpm config.NFPM, format string, artifacts []*artifact.Artifact) error { // TODO: improve this. - infoArch := artifacts[0].Goarch + artifacts[0].Go386 + artifacts[0].Goarm + artifacts[0].Gomips // key used for the ConventionalFileName et al - arch := infoArch + artifacts[0].Goamd64 + artifacts[0].Goarm64 + artifacts[0].Goppc64 + artifacts[0].Goriscv64 // unique arch key + infoArch := artifacts[0].Goarch + artifacts[0].Goarm + artifacts[0].Gomips // key used for the ConventionalFileName et al + arch := infoArch + artifacts[0].Go386 + artifacts[0].Goamd64 + artifacts[0].Goarm64 + artifacts[0].Goppc64 + artifacts[0].Goriscv64 // unique arch key infoPlatform := artifacts[0].Goos if infoPlatform == "ios" { if format == "deb" { diff --git a/internal/pipe/nfpm/nfpm_test.go b/internal/pipe/nfpm/nfpm_test.go index c19ff5135..c2705ce02 100644 --- a/internal/pipe/nfpm/nfpm_test.go +++ b/internal/pipe/nfpm/nfpm_test.go @@ -592,6 +592,18 @@ func doTestRunPipeConventionalNameTemplate(t *testing.T, snapshot bool) { }, }) } + case "386": + ctx.Artifacts.Add(&artifact.Artifact{ + Name: "subdir/mybin", + Path: binPath, + Goarch: goarch, + Goos: goos, + Go386: "sse2", + Type: artifact.Binary, + Extra: map[string]interface{}{ + artifact.ExtraID: "default", + }, + }) case "riscv64": ctx.Artifacts.Add(&artifact.Artifact{ Name: "subdir/mybin",