Commita6d66cc

authored

chore: ensure correct version of golangci-lint is run in ci (#13869)

1 parent90a6025 commita6d66ccCopy full SHA for a6d66cc

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -448,8 +448,7 @@ lint/ts:`
`448`	`448`	`lint/go:`
`449`	`449`	`./scripts/check_enterprise_imports.sh`
`450`	`450`	`linter_ver=$(shell egrep -o 'GOLANGCI_LINT_VERSION=\S+' dogfood/Dockerfile \| cut -d '=' -f 2)`
`451`		`-go install github.com/golangci/golangci-lint/cmd/golangci-lint@v$$linter_ver`
`452`		`-golangci-lint run`
	`451`	`+go run github.com/golangci/golangci-lint/cmd/golangci-lint@v$$linter_ver run`
`453`	`452`	`.PHONY: lint/go`
`454`	`453`
`455`	`454`	`lint/examples:`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ type APIVersion struct {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`func (vAPIVersion)WithBackwardCompat(majs...int)APIVersion {`
`29`		`-v.additionalMajors=append(v.additionalMajors,majs[:]...)`
	`29`	`+v.additionalMajors=append(v.additionalMajors,majs...)`
`30`	`30`	`returnv`
`31`	`31`	`}`
`32`	`32`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -350,7 +350,7 @@ func (api API) postWorkspaceProxy(rw http.ResponseWriter, r http.Request) {`
`350`	`350`	`Name:req.Name,`
`351`	`351`	`DisplayName:req.DisplayName,`
`352`	`352`	`Icon:req.Icon,`
`353`		`-TokenHashedSecret:hashedSecret[:],`
	`353`	`+TokenHashedSecret:hashedSecret,`
`354`	`354`	`// Enabled by default, but will be disabled on register if the proxy has`
`355`	`355`	`// it disabled.`
`356`	`356`	`DerpEnabled:true,`

Comments

(0)