go/goreleaser
go/goreleaser
1
0
Fork 0
mirror of https://github.com/goreleaser/goreleaser.git synced 2025-03-17 20:47:50 +02:00
Code Issues Releases Activity

fix: build --single-target filters (#5114)

Browse Source 
make them more precise, as its currently only taking GOOS/GOARCH into
account, and we can do more.

closes #5112

---------

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

2
cmd/build.go
View File

@ -55,7 +55,7 @@ Its intended usage is, for example, within Makefiles to avoid setting up ldflags
It also allows you to generate a local build for your current machine only using the ` + "`--single-target`" + ` option, and specific build IDs using the ` + "`--id`" + ` option in case you have more than one.
When using ` + "`--single-target`" + `, the ` + "`GOOS`" + ` and ` + "`GOARCH`" + ` environment variables are used to determine the target, defaulting to the current machine target if not set.
When using ` + "`--single-target`" + `, the ` + "`GOOS`, `GOARCH`, `GOARM`, `GOAMD64`, and `GOMIPS`" + ` environment variables are used to determine the target, defaulting to the current machine target if not set.
`,
SilenceUsage: true,
SilenceErrors: true,

3
internal/pipe/build/filter.go
View File

@ -2,7 +2,6 @@ package build
import (
"fmt"
"strings"
"github.com/caarlos0/log"
"github.com/goreleaser/goreleaser/v2/pkg/context"
@ -18,7 +17,7 @@ func filter(ctx *context.Context, targets []string) []string {
var result []string
for _, t := range targets {
if !strings.HasPrefix(t, target) {
if t != target {
continue
}
result = append(result, t)

3
internal/pipe/build/filter_test.go
View File

@ -15,6 +15,7 @@ var filterTestTargets = []string{
"darwin_amd64_v1",
"darwin_amd64_v2",
"darwin_arm64",
"darwin_arm_7",
}
func TestFilter(t *testing.T) {
@ -26,7 +27,7 @@ func TestFilter(t *testing.T) {
t.Run("target", func(t *testing.T) {
ctx := testctx.New(func(ctx *context.Context) {
ctx.Partial = true
ctx.PartialTarget = "darwin_amd64"
ctx.PartialTarget = "darwin_amd64_v1"
})
require.Equal(t, []string{
"darwin_amd64_v1",

20
internal/pipe/partial/partial.go
View File

@ -3,6 +3,7 @@ package partial
import (
"os"
"runtime"
"strings"
"github.com/charmbracelet/x/exp/ordered"
"github.com/goreleaser/goreleaser/v2/pkg/context"
@ -21,5 +22,22 @@ func (Pipe) Run(ctx *context.Context) error {
func getFilter() string {
goos := ordered.First(os.Getenv("GGOOS"), os.Getenv("GOOS"), runtime.GOOS)
goarch := ordered.First(os.Getenv("GGOARCH"), os.Getenv("GOARCH"), runtime.GOARCH)
return goos + "_" + goarch
target := goos + "_" + goarch
if strings.HasSuffix(target, "_amd64") {
goamd64 := ordered.First(os.Getenv("GGOAMD64"), os.Getenv("GOAMD64"), "v1")
target = target + "_" + goamd64
}
if strings.HasSuffix(target, "_arm") {
goarm := ordered.First(os.Getenv("GGOARM"), os.Getenv("GOARM"), "6")
target = target + "_" + goarm
}
if strings.HasSuffix(target, "_mips") ||
strings.HasSuffix(target, "_mips64") ||
strings.HasSuffix(target, "_mipsle") ||
strings.HasSuffix(target, "_mips64le") {
gomips := ordered.First(os.Getenv("GGOMIPS"), os.Getenv("GOMIPS"), "hardfloat")
target = target + "_" + gomips
}
return target
}

56
internal/pipe/partial/partial_test.go
View File

@ -46,12 +46,68 @@ func TestRun(t *testing.T) {
require.NoError(t, pipe.Run(ctx))
require.Equal(t, "windows_arm64", ctx.PartialTarget)
})
t.Run("custom GGOARM", func(t *testing.T) {
ctx := testctx.NewWithCfg(config.Project{
Dist: "dist",
}, testctx.Partial)
t.Setenv("GGOOS", "linux")
t.Setenv("GGOARCH", "arm")
t.Run("default", func(t *testing.T) {
require.NoError(t, pipe.Run(ctx))
require.Equal(t, "linux_arm_6", ctx.PartialTarget)
})
t.Run("default", func(t *testing.T) {
t.Setenv("GGOARM", "7")
require.NoError(t, pipe.Run(ctx))
require.Equal(t, "linux_arm_7", ctx.PartialTarget)
})
})
t.Run("custom GGOAMD64", func(t *testing.T) {
ctx := testctx.NewWithCfg(config.Project{
Dist: "dist",
}, testctx.Partial)
t.Setenv("GGOOS", "linux")
t.Setenv("GGOARCH", "amd64")
t.Run("default", func(t *testing.T) {
require.NoError(t, pipe.Run(ctx))
require.Equal(t, "linux_amd64_v1", ctx.PartialTarget)
})
t.Run("default", func(t *testing.T) {
t.Setenv("GGOAMD64", "v4")
require.NoError(t, pipe.Run(ctx))
require.Equal(t, "linux_amd64_v4", ctx.PartialTarget)
})
})
t.Run("custom GGOMIPS", func(t *testing.T) {
ctx := testctx.NewWithCfg(config.Project{
Dist: "dist",
}, testctx.Partial)
t.Setenv("GGOOS", "linux")
for _, mips := range []string{"mips", "mips64", "mipsle", "mips64le"} {
t.Run(mips, func(t *testing.T) {
t.Setenv("GGOARCH", mips)
t.Run("default", func(t *testing.T) {
require.NoError(t, pipe.Run(ctx))
require.Equal(t, "linux_"+mips+"_hardfloat", ctx.PartialTarget)
})
t.Run("default", func(t *testing.T) {
t.Setenv("GGOMIPS", "softfloat")
require.NoError(t, pipe.Run(ctx))
require.Equal(t, "linux_"+mips+"_softfloat", ctx.PartialTarget)
})
})
}
})
t.Run("using runtime", func(t *testing.T) {
ctx := testctx.NewWithCfg(config.Project{
Dist: "dist",
}, testctx.Partial)
require.NoError(t, pipe.Run(ctx))
target := fmt.Sprintf("%s_%s", runtime.GOOS, runtime.GOARCH)
// commonly tests will run on either arm64 or amd64.
if runtime.GOARCH == "amd64" {
target += "_v1"
}
require.Equal(t, target, ctx.PartialTarget)
})
}