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: goamd64 should allow the only range from v1 to v4

Browse Source 
It was just allowing v2 and v3 due to some misreading on my side.
This commit fixes it to allow v1, v2, v3 and v4.

refs #3016

Signed-off-by: Carlos A Becker <caarlos0@gmail.com>
This commit is contained in:
Carlos A Becker
2022-04-13 21:29:39 -03:00
parent 09c622c226
commit 53bbc6546f
32 changed files with 215 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/builders/buildtarget/targets.go
View File

@@ -257,5 +257,5 @@ var (
validGoarm = []string{"5", "6", "7"}
validGomips = []string{"hardfloat", "softfloat"}
validGoamd64 = []string{"v2", "v3"}
validGoamd64 = []string{"v1", "v2", "v3", "v4"}
)

22
internal/builders/buildtarget/targets_test.go
View File

@@ -40,8 +40,10 @@ func TestAllBuildTargets(t *testing.T) {
"softfloat",
},
Goamd64: []string{
"v1",
"v2",
"v3",
"v4",
},
Ignore: []config.IgnoredBuild{
{
@@ -69,7 +71,9 @@ func TestAllBuildTargets(t *testing.T) {
require.NoError(t, err)
require.Equal(t, []string{
"linux_386",
"linux_amd64_v1",
"linux_amd64_v2",
"linux_amd64_v4",
"linux_arm_6",
"linux_arm64",
"linux_mips_hardfloat",
@@ -79,18 +83,26 @@ func TestAllBuildTargets(t *testing.T) {
"linux_mipsle_softfloat",
"linux_mips64le_hardfloat",
"linux_riscv64",
"darwin_amd64_v1",
"darwin_amd64_v2",
"darwin_amd64_v4",
"darwin_arm64",
"freebsd_386",
"freebsd_amd64_v1",
"freebsd_amd64_v2",
"freebsd_amd64_v4",
"freebsd_arm_6",
"freebsd_arm_7",
"freebsd_arm64",
"openbsd_386",
"openbsd_amd64_v1",
"openbsd_amd64_v2",
"openbsd_amd64_v4",
"openbsd_arm64",
"windows_386",
"windows_amd64_v1",
"windows_amd64_v2",
"windows_amd64_v4",
"windows_arm_6",
"windows_arm_7",
"js_wasm",
@@ -102,7 +114,9 @@ func TestAllBuildTargets(t *testing.T) {
require.NoError(t, err)
require.Equal(t, []string{
"linux_386",
"linux_amd64_v1",
"linux_amd64_v2",
"linux_amd64_v4",
"linux_arm_6",
"linux_arm64",
"linux_mips_hardfloat",
@@ -112,18 +126,26 @@ func TestAllBuildTargets(t *testing.T) {
"linux_mipsle_softfloat",
"linux_mips64le_hardfloat",
"linux_riscv64",
"darwin_amd64_v1",
"darwin_amd64_v2",
"darwin_amd64_v4",
"darwin_arm64",
"freebsd_386",
"freebsd_amd64_v1",
"freebsd_amd64_v2",
"freebsd_amd64_v4",
"freebsd_arm_6",
"freebsd_arm_7",
"freebsd_arm64",
"openbsd_386",
"openbsd_amd64_v1",
"openbsd_amd64_v2",
"openbsd_amd64_v4",
"openbsd_arm64",
"windows_386",
"windows_amd64_v1",
"windows_amd64_v2",
"windows_amd64_v4",
"windows_arm_6",
"windows_arm_7",
"windows_arm64",

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

@@ -62,7 +62,7 @@ func (*Builder) WithDefaults(build config.Build) (config.Build, error) {
build.Gomips = []string{"hardfloat"}
}
if len(build.Goamd64) == 0 {
build.Goamd64 = []string{"v2"}
build.Goamd64 = []string{"v1"}
}
targets, err := buildtarget.List(build)
build.Targets = targets

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

@@ -72,10 +72,10 @@ func TestWithDefaults(t *testing.T) {
Binary: "foo",
},
targets: []string{
"linux_amd64_v2",
"linux_amd64_v1",
"linux_386",
"linux_arm64",
"darwin_amd64_v2",
"darwin_amd64_v1",
"darwin_arm64",
},
goBinary: "go",
@@ -102,10 +102,10 @@ func TestWithDefaults(t *testing.T) {
Dir: "./testdata",
},
targets: []string{
"linux_amd64_v2",
"linux_amd64_v1",
"linux_386",
"linux_arm64",
"darwin_amd64_v2",
"darwin_amd64_v1",
"darwin_arm64",
},
goBinary: "go",
@@ -117,10 +117,10 @@ func TestWithDefaults(t *testing.T) {
Dir: "./nope",
},
targets: []string{
"linux_amd64_v2",
"linux_amd64_v1",
"linux_386",
"linux_arm64",
"darwin_amd64_v2",
"darwin_amd64_v1",
"darwin_arm64",
},
goBinary: "go",