Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(build): remove unused param #3248

Merged
merged 1 commit into from Jul 22, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 0 additions & 27 deletions internal/builders/buildtarget/targets.go
Expand Up @@ -4,8 +4,6 @@ package buildtarget

import (
"fmt"
"os"
"os/exec"
"strings"

"github.com/caarlos0/log"
Expand All @@ -25,14 +23,6 @@ func (t target) String() string {

// List compiles the list of targets for the given builds.
func List(build config.Build) ([]string, error) {
version, err := goVersion(build)
if err != nil {
return nil, err
}
return matrix(build, version)
}

func matrix(build config.Build, version []byte) ([]string, error) {
// nolint:prealloc
var targets []target
// nolint:prealloc
Expand Down Expand Up @@ -135,23 +125,6 @@ func ignored(build config.Build, target target) bool {
return false
}

func goVersion(build config.Build) ([]byte, error) {
cmd := exec.Command(build.GoBinary, "version")
// If the build.Dir is acessible, set the cmd dir to it in case
// of reletive path to GoBinary
if fileInfo, err := os.Stat(build.Dir); err == nil {
if !fileInfo.IsDir() {
return nil, fmt.Errorf("invalid builds.dir property, it should be a directory: %s", build.Dir)
}
cmd.Dir = build.Dir
}
bts, err := cmd.CombinedOutput()
if err != nil {
return nil, fmt.Errorf("unable to determine version of go binary (%s): %w", build.GoBinary, err)
}
return bts, nil
}

func valid(target target) bool {
return contains(target.os+target.arch, validTargets)
}
Expand Down
43 changes: 11 additions & 32 deletions internal/builders/buildtarget/targets_test.go
Expand Up @@ -67,7 +67,7 @@ func TestAllBuildTargets(t *testing.T) {
}

t.Run("go 1.18", func(t *testing.T) {
result, err := matrix(build, []byte("go version go1.18.0"))
result, err := List(build)
require.NoError(t, err)
require.Equal(t, []string{
"linux_386",
Expand Down Expand Up @@ -111,46 +111,46 @@ func TestAllBuildTargets(t *testing.T) {
})

t.Run("invalid goos", func(t *testing.T) {
_, err := matrix(config.Build{
_, err := List(config.Build{
Goos: []string{"invalid"},
Goarch: []string{"amd64"},
Goamd64: []string{"v2"},
}, []byte("go version go1.18.0"))
})
require.EqualError(t, err, "invalid goos: invalid")
})

t.Run("invalid goarch", func(t *testing.T) {
_, err := matrix(config.Build{
_, err := List(config.Build{
Goos: []string{"linux"},
Goarch: []string{"invalid"},
}, []byte("go version go1.18.0"))
})
require.EqualError(t, err, "invalid goarch: invalid")
})

t.Run("invalid goarm", func(t *testing.T) {
_, err := matrix(config.Build{
_, err := List(config.Build{
Goos: []string{"linux"},
Goarch: []string{"arm"},
Goarm: []string{"invalid"},
}, []byte("go version go1.18.0"))
})
require.EqualError(t, err, "invalid goarm: invalid")
})

t.Run("invalid gomips", func(t *testing.T) {
_, err := matrix(config.Build{
_, err := List(config.Build{
Goos: []string{"linux"},
Goarch: []string{"mips"},
Gomips: []string{"invalid"},
}, []byte("go version go1.18.0"))
})
require.EqualError(t, err, "invalid gomips: invalid")
})

t.Run("invalid goamd64", func(t *testing.T) {
_, err := matrix(config.Build{
_, err := List(config.Build{
Goos: []string{"linux"},
Goarch: []string{"amd64"},
Goamd64: []string{"invalid"},
}, []byte("go version go1.18.0"))
})
require.EqualError(t, err, "invalid goamd64: invalid")
})
}
Expand Down Expand Up @@ -236,25 +236,4 @@ func TestList(t *testing.T) {
require.NoError(t, err)
require.Equal(t, []string{"linux_amd64_v2"}, targets)
})

t.Run("error with dir", func(t *testing.T) {
_, err := List(config.Build{
Goos: []string{"linux"},
Goarch: []string{"amd64"},
Goamd64: []string{"v2"},
GoBinary: "go",
Dir: "targets.go",
})
require.EqualError(t, err, "invalid builds.dir property, it should be a directory: targets.go")
})

t.Run("fail", func(t *testing.T) {
_, err := List(config.Build{
Goos: []string{"linux"},
Goarch: []string{"amd64"},
Goamd64: []string{"v2"},
GoBinary: "nope",
})
require.EqualError(t, err, `unable to determine version of go binary (nope): exec: "nope": executable file not found in $PATH`)
})
}