@@ -35,6 +35,8 @@ var availableGolangciLintVersions = map[int]map[int][]int{
35
35
},
36
36
}
37
37
38
+ const defaultGolangciLintVersion = "1.14.x"
39
+
38
40
type Preparer struct {
39
41
cfg config.Config
40
42
}
@@ -176,14 +178,6 @@ func (p Preparer) run(needStreamToOutput bool) *result.Result {
176
178
return saveErr (err )
177
179
}
178
180
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
-
187
181
// setup golangci-lint - do it after preparation to disallow overwriting golangci-lint version by user-defined commands
188
182
err = runStepGroup (res .Log , "setup golangci-lint" , func (sg * result.StepGroup , log logutil.Log ) error {
189
183
version , setupErr := p .setupGolangciLint (ctx , sg , log , & res .ServiceConfig , runner )
@@ -198,6 +192,14 @@ func (p Preparer) run(needStreamToOutput bool) *result.Result {
198
192
return saveErr (err )
199
193
}
200
194
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
+
201
203
if ! p .cfg .GetBool ("RUN" , false ) { // the option RUN is enabled only for manual testing
202
204
return res
203
205
}
@@ -408,13 +410,12 @@ func (p Preparer) parseGolangciLintVersion(sg *result.StepGroup, log logutil.Log
408
410
return v , nil
409
411
}
410
412
411
- const defaultVersion = "1.13.x"
412
- v , err := parseVersion (defaultVersion )
413
+ v , err := parseVersion (defaultGolangciLintVersion )
413
414
if err != nil {
414
415
panic (err )
415
416
}
416
417
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 )
418
419
return v , nil
419
420
}
420
421
0 commit comments