Skip to content

Commit 266e46b

Browse files
committed
lanai-cli init allow Module.yml to skip default binaries installation
1 parent 5c40c5b commit 266e46b

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

cmd/lanai-cli/initcmd/binaries.go

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ var defaultBinaries = map[string]string{
2828
"github.com/axw/gocov/gocov": "v1.1.0",
2929
"github.com/AlekSi/gocov-xml": "v1.1.0",
3030
"gotest.tools/gotestsum": "v1.12.0",
31-
"github.com/golangci/golangci-lint/cmd/golangci-lint": "v1.59.1",
31+
"github.com/golangci/golangci-lint/cmd/golangci-lint": "v1.64.8",
3232
}
3333

3434
func installBinaries(ctx context.Context) error {
@@ -40,11 +40,17 @@ func installBinaries(ctx context.Context) error {
4040
binaries[p] = v
4141
}
4242
for _, b := range Module.Binaries {
43-
if b.Package == "" || b.Version == "" {
43+
switch {
44+
case len(b.Package) == 0:
4445
logger.Warnf(`Invalid binaries entry in Module.yml: package="%s", version="%s"`, b.Package, b.Version)
45-
continue
46+
case len(b.Version) == 0:
47+
if _, ok := binaries[b.Package]; ok {
48+
logger.Warnf(`Skipping default binaries install: %s@%s`, b.Package, binaries[b.Package])
49+
delete(binaries, b.Package)
50+
}
51+
default:
52+
binaries[b.Package] = b.Version
4653
}
47-
binaries[b.Package] = b.Version
4854
}
4955

5056
for p, v := range binaries {

0 commit comments

Comments
 (0)