eeafj/golangci-lint
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

fix: help command (#2681)
Some checks failed
Release a tag / release (push) Has been cancelled
Release a tag / docker-release (map[Dockerfile:build/Dockerfile.alpine]) (push) Has been cancelled
Release a tag / docker-release (map[Dockerfile:build/Dockerfile]) (push) Has been cancelled

Browse Source
This commit is contained in:
Ludovic Fernandez 2022-03-24 12:49:36 +01:00 committed by GitHub
parent 7bbbe77e5e
commit 8bdc4d3f80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/commands/executor.go
View File

@ -110,7 +110,7 @@ func NewExecutor(version, commit, date string) *Executor {
e.log.Fatalf("Can't read config: %s", err) e.log.Fatalf("Can't read config: %s", err)
} }
if commandLineCfg.Run.Go == "" && e.cfg.Run.Go == "" { if (commandLineCfg == nil || commandLineCfg.Run.Go == "") && e.cfg != nil && e.cfg.Run.Go == "" {
e.cfg.Run.Go = config.DetectGoVersion() e.cfg.Run.Go = config.DetectGoVersion()
} }

20
scripts/expand_website_templates/main.go
View File

@ -143,22 +143,22 @@ func getLatestVersion() (string, error) {
http.NoBody, http.NoBody,
) )
if err != nil { if err != nil {
return "", fmt.Errorf("failed to prepare a http request: %s", err) return "", fmt.Errorf("failed to prepare a http request: %w", err)
} }
req.Header.Add("Accept", "application/vnd.github.v3+json") req.Header.Add("Accept", "application/vnd.github.v3+json")
resp, err := http.DefaultClient.Do(req) resp, err := http.DefaultClient.Do(req)
if err != nil { if err != nil {
return "", fmt.Errorf("failed to get http response for the latest tag: %s", err) return "", fmt.Errorf("failed to get http response for the latest tag: %w", err)
} }
defer resp.Body.Close() defer resp.Body.Close()
body, err := io.ReadAll(resp.Body) body, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {
return "", fmt.Errorf("failed to read a body for the latest tag: %s", err) return "", fmt.Errorf("failed to read a body for the latest tag: %w", err)
} }
release := latestRelease{} release := latestRelease{}
err = json.Unmarshal(body, &release) err = json.Unmarshal(body, &release)
if err != nil { if err != nil {
return "", fmt.Errorf("failed to unmarshal the body for the latest tag: %s", err) return "", fmt.Errorf("failed to unmarshal the body for the latest tag: %w", err)
} }
return release.TagName, nil return release.TagName, nil
} }
@ -166,21 +166,21 @@ func getLatestVersion() (string, error) {
func buildTemplateContext() (map[string]string, error) { func buildTemplateContext() (map[string]string, error) {
golangciYamlExample, err := os.ReadFile(".golangci.example.yml") golangciYamlExample, err := os.ReadFile(".golangci.example.yml")
if err != nil { if err != nil {
return nil, fmt.Errorf("can't read .golangci.example.yml: %s", err) return nil, fmt.Errorf("can't read .golangci.example.yml: %w", err)
} }
snippets, err := extractExampleSnippets(golangciYamlExample) snippets, err := extractExampleSnippets(golangciYamlExample)
if err != nil { if err != nil {
return nil, fmt.Errorf("can't read .golangci.example.yml: %s", err) return nil, fmt.Errorf("can't read .golangci.example.yml: %w", err)
} }
if err = exec.Command("make", "build").Run(); err != nil { if err = exec.Command("make", "build").Run(); err != nil {
return nil, fmt.Errorf("can't run go install: %s", err) return nil, fmt.Errorf("can't run go install: %w", err)
} }
lintersOut, err := exec.Command("./golangci-lint", "help", "linters").Output() lintersOut, err := exec.Command("./golangci-lint", "help", "linters").Output()
if err != nil { if err != nil {
return nil, fmt.Errorf("can't run linters cmd: %s", err) return nil, fmt.Errorf("can't run linters cmd: %w", err)
} }
lintersOutParts := bytes.Split(lintersOut, []byte("\n\n")) lintersOutParts := bytes.Split(lintersOut, []byte("\n\n"))
@ -190,7 +190,7 @@ func buildTemplateContext() (map[string]string, error) {
helpCmd.Env = append(helpCmd.Env, "HELP_RUN=1") // make default concurrency stable: don't depend on machine CPU number helpCmd.Env = append(helpCmd.Env, "HELP_RUN=1") // make default concurrency stable: don't depend on machine CPU number
help, err := helpCmd.Output() help, err := helpCmd.Output()
if err != nil { if err != nil {
return nil, fmt.Errorf("can't run help cmd: %s", err) return nil, fmt.Errorf("can't run help cmd: %w", err)
} }
helpLines := bytes.Split(help, []byte("\n")) helpLines := bytes.Split(help, []byte("\n"))
@ -202,7 +202,7 @@ func buildTemplateContext() (map[string]string, error) {
latestVersion, err := getLatestVersion() latestVersion, err := getLatestVersion()
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to get latest version: %s", err) return nil, fmt.Errorf("failed to get the latest version: %w", err)
} }
return map[string]string{ return map[string]string{