From ccdd70fc6a336a98590006eadc6f26df2f97efd6 Mon Sep 17 00:00:00 2001 From: jolheiser Date: Mon, 21 Nov 2022 22:04:07 -0600 Subject: [PATCH 1/2] feat: add windows to default builds Signed-off-by: jolheiser --- internal/builders/golang/build.go | 2 +- internal/builders/golang/build_test.go | 9 +++++++++ internal/pipe/build/build_test.go | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/internal/builders/golang/build.go b/internal/builders/golang/build.go index 0d3c6366d7c..6c53b2eff36 100644 --- a/internal/builders/golang/build.go +++ b/internal/builders/golang/build.go @@ -53,7 +53,7 @@ func (*Builder) WithDefaults(build config.Build) (config.Build, error) { } if len(build.Targets) == 0 { if len(build.Goos) == 0 { - build.Goos = []string{"linux", "darwin"} + build.Goos = []string{"linux", "darwin", "windows"} } if len(build.Goarch) == 0 { build.Goarch = []string{"amd64", "arm64", "386"} diff --git a/internal/builders/golang/build_test.go b/internal/builders/golang/build_test.go index 40f63800edd..4ddfe5a75da 100644 --- a/internal/builders/golang/build_test.go +++ b/internal/builders/golang/build_test.go @@ -77,6 +77,9 @@ func TestWithDefaults(t *testing.T) { "linux_arm64", "darwin_amd64_v1", "darwin_arm64", + "windows_amd64_v1", + "windows_arm64", + "windows_386", }, goBinary: "go", }, @@ -167,6 +170,9 @@ func TestWithDefaults(t *testing.T) { "linux_arm64", "darwin_amd64_v1", "darwin_arm64", + "windows_amd64_v1", + "windows_arm64", + "windows_386", }, goBinary: "go", }, @@ -182,6 +188,9 @@ func TestWithDefaults(t *testing.T) { "linux_arm64", "darwin_amd64_v1", "darwin_arm64", + "windows_amd64_v1", + "windows_arm64", + "windows_386", }, goBinary: "go", }, diff --git a/internal/pipe/build/build_test.go b/internal/pipe/build/build_test.go index 596b0e0740a..f89a8acdfcb 100644 --- a/internal/pipe/build/build_test.go +++ b/internal/pipe/build/build_test.go @@ -275,7 +275,7 @@ func TestDefaultEmptyBuild(t *testing.T) { require.Equal(t, ctx.Config.ProjectName, build.Binary) require.Equal(t, ".", build.Dir) require.Equal(t, ".", build.Main) - require.Equal(t, []string{"linux", "darwin"}, build.Goos) + require.Equal(t, []string{"linux", "darwin", "windows"}, build.Goos) require.Equal(t, []string{"amd64", "arm64", "386"}, build.Goarch) require.Equal(t, []string{"6"}, build.Goarm) require.Equal(t, []string{"hardfloat"}, build.Gomips) @@ -373,7 +373,7 @@ func TestDefaultPartialBuilds(t *testing.T) { require.Equal(t, "foo", build.Binary) require.Equal(t, ".", build.Main) require.Equal(t, "baz", build.Dir) - require.Equal(t, []string{"linux", "darwin"}, build.Goos) + require.Equal(t, []string{"linux", "darwin", "windows"}, build.Goos) require.Equal(t, []string{"386"}, build.Goarch) require.Equal(t, []string{"6"}, build.Goarm) require.Len(t, build.Ldflags, 1) From 919b4ed89c962fc6a3b713123e8d2e212a322396 Mon Sep 17 00:00:00 2001 From: jolheiser Date: Tue, 22 Nov 2022 08:33:13 -0600 Subject: [PATCH 2/2] docs: add windows note to default build Signed-off-by: jolheiser --- www/docs/customization/build.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/docs/customization/build.md b/www/docs/customization/build.md index a069958c41e..472cf50c197 100644 --- a/www/docs/customization/build.md +++ b/www/docs/customization/build.md @@ -77,7 +77,7 @@ builds: # GOOS list to build for. # For more info refer to: https://golang.org/doc/install/source#environment - # Defaults are darwin and linux. + # Defaults are darwin, linux, and windows. goos: - freebsd - windows