Skip to content

Commit

Permalink
fix: fix a lint error
Browse files Browse the repository at this point in the history
  • Loading branch information
suzuki-shunsuke committed Sep 22, 2024
1 parent 010ef4c commit 760340c
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 47 deletions.
38 changes: 19 additions & 19 deletions pkg/runtime/parse.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,28 @@ import (
func allRuntimes() []*Runtime {
return []*Runtime{
{
GOOS: "darwin",
GOARCH: "amd64",
GOOS: darwin,
GOARCH: amd64,
},
{
GOOS: "darwin",
GOARCH: "arm64",
GOOS: darwin,
GOARCH: arm64,
},
{
GOOS: "linux",
GOARCH: "amd64",
GOOS: linux,
GOARCH: amd64,
},
{
GOOS: "linux",
GOARCH: "arm64",
GOOS: linux,
GOARCH: arm64,
},
{
GOOS: "windows",
GOARCH: "amd64",
GOOS: windows,
GOARCH: amd64,
},
{
GOOS: "windows",
GOARCH: "arm64",
GOOS: windows,
GOARCH: arm64,
},
}
}
Expand All @@ -48,29 +48,29 @@ func GetRuntimes(env string) ([]*Runtime, error) {
}, nil
}
switch o {
case "darwin", "linux", "windows":
case darwin, linux, windows:
return []*Runtime{
{
GOOS: o,
GOARCH: "amd64",
GOARCH: amd64,
},
{
GOOS: o,
GOARCH: "arm64",
GOARCH: arm64,
},
}, nil
case "amd64", "arm64":
case amd64, arm64:
return []*Runtime{
{
GOOS: "darwin",
GOOS: darwin,
GOARCH: o,
},
{
GOOS: "windows",
GOOS: windows,
GOARCH: o,
},
{
GOOS: "linux",
GOOS: linux,
GOARCH: o,
},
}, nil
Expand Down
34 changes: 17 additions & 17 deletions pkg/runtime/parse_internal_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,46 +20,46 @@ func TestGetRuntimesFromEnvs(t *testing.T) { //nolint:funlen
},
{
name: "all",
envs: []string{"darwin", "all"},
envs: []string{darwin, "all"},
rts: allRuntimes(),
},
{
name: "darwin amd64",
envs: []string{"darwin", "amd64"},
envs: []string{darwin, amd64},
rts: []*Runtime{
{
GOOS: "darwin",
GOARCH: "amd64",
GOOS: darwin,
GOARCH: amd64,
},
{
GOOS: "darwin",
GOARCH: "arm64",
GOOS: darwin,
GOARCH: arm64,
},
{
GOOS: "windows",
GOARCH: "amd64",
GOOS: windows,
GOARCH: amd64,
},
{
GOOS: "linux",
GOARCH: "amd64",
GOOS: linux,
GOARCH: amd64,
},
},
},
{
name: "darwin linux/amd64",
envs: []string{"darwin", "linux/amd64"},
envs: []string{darwin, "linux/amd64"},
rts: []*Runtime{
{
GOOS: "darwin",
GOARCH: "amd64",
GOOS: darwin,
GOARCH: amd64,
},
{
GOOS: "darwin",
GOARCH: "arm64",
GOOS: darwin,
GOARCH: arm64,
},
{
GOOS: "linux",
GOARCH: "amd64",
GOOS: linux,
GOARCH: amd64,
},
},
},
Expand Down
30 changes: 19 additions & 11 deletions pkg/runtime/runtime.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@ import (
"runtime"
)

const (
amd64 = "amd64"
arm64 = "arm64"
darwin = "darwin"
linux = "linux"
windows = "windows"
)

type Runtime struct {
GOOS string
GOARCH string
Expand All @@ -26,22 +34,22 @@ func NewR() *Runtime {
}

func (rt *Runtime) IsWindows() bool {
return rt.GOOS == "windows"
return rt.GOOS == windows
}

func (rt *Runtime) Env() string {
return fmt.Sprintf("%s/%s", rt.GOOS, rt.GOARCH)
}

func (rt *Runtime) Arch(rosetta2, windowsARMEmulation bool) string {
if rt.GOARCH == "amd64" {
return "amd64"
if rt.GOARCH == amd64 {
return amd64
}
if rt.GOOS == "darwin" && rosetta2 {
return "amd64"
if rt.GOOS == darwin && rosetta2 {
return amd64
}
if rt.IsWindows() && windowsARMEmulation {
return "amd64"
return amd64
}
return rt.GOARCH
}
Expand All @@ -61,14 +69,14 @@ func goarch() string {
}

func GOOSList() []string {
return []string{"darwin", "linux", "windows"}
return []string{darwin, linux, windows}
}

func GOOSMap() map[string]struct{} {
return map[string]struct{}{
"darwin": {},
"linux": {},
"windows": {},
darwin: {},
linux: {},
windows: {},
}
}

Expand All @@ -78,5 +86,5 @@ func IsOS(k string) bool {
}

func GOARCHList() []string {
return []string{"amd64", "arm64"}
return []string{amd64, arm64}
}

0 comments on commit 760340c

Please sign in to comment.