Skip to content
This repository was archived by the owner on Jun 2, 2023. It is now read-only.

Commit a4dd341

Browse files
committed
fix build runner
1 parent 351c6be commit a4dd341

File tree

2 files changed

+17
-11
lines changed

2 files changed

+17
-11
lines changed

.golangci.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,8 @@ linters:
2727
- gochecknoinits
2828
- scopelint
2929
- dupl
30+
31+
# golangci.com configuration
32+
# https://github.com/golangci/golangci/wiki/Configuration
33+
service:
34+
golangci-lint-version: 1.13.x # use fixed version to not introduce new linters unexpectedly

pkg/goenvbuild/preparer.go

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ var availableGolangciLintVersions = map[int]map[int][]int{
3535
},
3636
}
3737

38+
const defaultGolangciLintVersion = "1.14.x"
39+
3840
type Preparer struct {
3941
cfg config.Config
4042
}
@@ -176,14 +178,6 @@ func (p Preparer) run(needStreamToOutput bool) *result.Result {
176178
return saveErr(err)
177179
}
178180

179-
// prepare repo
180-
err = runStepGroup(res.Log, "prepare repo", func(sg *result.StepGroup, log logutil.Log) error {
181-
return p.runPreparation(ctx, sg, log, &res.ServiceConfig, projectPath, runner)
182-
})
183-
if err != nil {
184-
return saveErr(err)
185-
}
186-
187181
// setup golangci-lint - do it after preparation to disallow overwriting golangci-lint version by user-defined commands
188182
err = runStepGroup(res.Log, "setup golangci-lint", func(sg *result.StepGroup, log logutil.Log) error {
189183
version, setupErr := p.setupGolangciLint(ctx, sg, log, &res.ServiceConfig, runner)
@@ -198,6 +192,14 @@ func (p Preparer) run(needStreamToOutput bool) *result.Result {
198192
return saveErr(err)
199193
}
200194

195+
// prepare repo
196+
err = runStepGroup(res.Log, "prepare repo", func(sg *result.StepGroup, log logutil.Log) error {
197+
return p.runPreparation(ctx, sg, log, &res.ServiceConfig, projectPath, runner)
198+
})
199+
if err != nil {
200+
return saveErr(err)
201+
}
202+
201203
if !p.cfg.GetBool("RUN", false) { // the option RUN is enabled only for manual testing
202204
return res
203205
}
@@ -408,13 +410,12 @@ func (p Preparer) parseGolangciLintVersion(sg *result.StepGroup, log logutil.Log
408410
return v, nil
409411
}
410412

411-
const defaultVersion = "1.13.x"
412-
v, err := parseVersion(defaultVersion)
413+
v, err := parseVersion(defaultGolangciLintVersion)
413414
if err != nil {
414415
panic(err)
415416
}
416417

417-
log.Infof("No golangci-lint version in config, use default: %q", defaultVersion)
418+
log.Infof("No golangci-lint version in config, use default: %q", defaultGolangciLintVersion)
418419
return v, nil
419420
}
420421

0 commit comments

Comments
 (0)