go/goreleaser
go/goreleaser
1
0
Fork 0
mirror of https://github.com/goreleaser/goreleaser.git synced 2024-12-27 01:33:39 +02:00
Code Issues Releases Activity

fix(build): overrides without specifying goarm64 et al (#5298)

Browse Source 
this will use the default value for GOMIPS, GOARM, GO386, and etc in
build overrides if they are not specified.

Signed-off-by: Carlos Alexandro Becker <caarlos0@users.noreply.github.com>
This commit is contained in:
Carlos Alexandro Becker 2024-11-21 21:09:59 -03:00 committed by GitHub
parent 11cd27ec20
commit 10ab79f858
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 158 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
internal/builders/golang/build.go
View File

@ -282,12 +282,21 @@ func (*Builder) Build(ctx *context.Context, build config.Build, options api.Opti
}
func withOverrides(ctx *context.Context, build config.Build, options api.Options) (config.BuildDetails, error) {
optsTarget := options.Goos + options.Goarch + options.Goamd64 + options.Go386 + options.Goarm + options.Goarm64 + options.Gomips + options.Goppc64 + options.Goriscv64
optsTarget := options.Goos + "_" + options.Goarch
if extra := options.Goamd64 + options.Go386 + options.Goarm + options.Goarm64 + options.Gomips + options.Goppc64 + options.Goriscv64; extra != "" {
optsTarget += "_" + extra
}
optsTarget = fixTarget(optsTarget)
for _, o := range build.BuildDetailsOverrides {
overrideTarget, err := tmpl.New(ctx).Apply(o.Goos + o.Goarch + o.Goamd64 + o.Go386 + o.Goarm + o.Goarm64 + o.Gomips + o.Goppc64 + o.Goriscv64)
s := o.Goos + "_" + o.Goarch
if extra := o.Goamd64 + o.Go386 + o.Goarm + o.Goarm64 + o.Gomips + o.Goppc64 + o.Goriscv64; extra != "" {
s += "_" + extra
}
overrideTarget, err := tmpl.New(ctx).Apply(s)
if err != nil {
return build.BuildDetails, err
}
overrideTarget = fixTarget(overrideTarget)
if optsTarget == overrideTarget {
dets := config.BuildDetails{

147
internal/builders/golang/build_test.go
View File

@ -1418,6 +1418,35 @@ func TestOverrides(t *testing.T) {
}, dets)
})
t.Run("with goarm64 unespecified", func(t *testing.T) {
dets, err := withOverrides(
testctx.New(),
config.Build{
BuildDetails: config.BuildDetails{
Ldflags: []string{"original"},
},
BuildDetailsOverrides: []config.BuildDetailsOverride{
{
Goos: "linux",
Goarch: "arm64",
BuildDetails: config.BuildDetails{
Ldflags: []string{"overridden"},
},
},
},
}, api.Options{
Goos: "linux",
Goarch: "arm64",
Goarm64: "v8.0",
},
)
require.NoError(t, err)
require.Equal(t, config.BuildDetails{
Ldflags: []string{"overridden"},
Env: []string{},
}, dets)
})
t.Run("with goarm", func(t *testing.T) {
dets, err := withOverrides(
testctx.New(),
@ -1448,6 +1477,35 @@ func TestOverrides(t *testing.T) {
}, dets)
})
t.Run("with goarm unespecified", func(t *testing.T) {
dets, err := withOverrides(
testctx.New(),
config.Build{
BuildDetails: config.BuildDetails{
Ldflags: []string{"original"},
},
BuildDetailsOverrides: []config.BuildDetailsOverride{
{
Goos: "linux",
Goarch: "arm",
BuildDetails: config.BuildDetails{
Ldflags: []string{"overridden"},
},
},
},
}, api.Options{
Goos: "linux",
Goarch: "arm",
Goarm: "6",
},
)
require.NoError(t, err)
require.Equal(t, config.BuildDetails{
Ldflags: []string{"overridden"},
Env: []string{},
}, dets)
})
t.Run("with gomips", func(t *testing.T) {
dets, err := withOverrides(
testctx.New(),
@ -1478,6 +1536,35 @@ func TestOverrides(t *testing.T) {
}, dets)
})
t.Run("with gomips unespecified", func(t *testing.T) {
dets, err := withOverrides(
testctx.New(),
config.Build{
BuildDetails: config.BuildDetails{
Ldflags: []string{"original"},
},
BuildDetailsOverrides: []config.BuildDetailsOverride{
{
Goos: "linux",
Goarch: "mips",
BuildDetails: config.BuildDetails{
Ldflags: []string{"overridden"},
},
},
},
}, api.Options{
Goos: "linux",
Goarch: "mips",
Gomips: "hardfloat",
},
)
require.NoError(t, err)
require.Equal(t, config.BuildDetails{
Ldflags: []string{"overridden"},
Env: []string{},
}, dets)
})
t.Run("with goriscv64", func(t *testing.T) {
dets, err := withOverrides(
testctx.New(),
@ -1508,6 +1595,36 @@ func TestOverrides(t *testing.T) {
}, dets)
})
t.Run("with goriscv64 unespecified", func(t *testing.T) {
dets, err := withOverrides(
testctx.New(),
config.Build{
BuildDetails: config.BuildDetails{
Ldflags: []string{"original"},
},
BuildDetailsOverrides: []config.BuildDetailsOverride{
{
Goos: "linux",
Goarch: "riscv64",
Goriscv64: "rva22u64",
BuildDetails: config.BuildDetails{
Ldflags: []string{"overridden"},
},
},
},
}, api.Options{
Goos: "linux",
Goarch: "riscv64",
Goriscv64: "rva22u64",
},
)
require.NoError(t, err)
require.Equal(t, config.BuildDetails{
Ldflags: []string{"overridden"},
Env: []string{},
}, dets)
})
t.Run("with go386", func(t *testing.T) {
dets, err := withOverrides(
testctx.New(),
@ -1537,6 +1654,36 @@ func TestOverrides(t *testing.T) {
Env: []string{},
}, dets)
})
t.Run("with go386 unespecified", func(t *testing.T) {
dets, err := withOverrides(
testctx.New(),
config.Build{
BuildDetails: config.BuildDetails{
Ldflags: []string{"original"},
},
BuildDetailsOverrides: []config.BuildDetailsOverride{
{
Goos: "linux",
Goarch: "386",
Go386: "sse2",
BuildDetails: config.BuildDetails{
Ldflags: []string{"overridden"},
},
},
},
}, api.Options{
Goos: "linux",
Goarch: "386",
Go386: "sse2",
},
)
require.NoError(t, err)
require.Equal(t, config.BuildDetails{
Ldflags: []string{"overridden"},
Env: []string{},
}, dets)
})
}
func TestWarnIfTargetsAndOtherOptionsTogether(t *testing.T) {