mirror of
https://github.com/coder/coder.git
synced 2025-03-14 10:09:57 +00:00
chore: ensure correct version of golangci-lint is run in ci (#13869)
This commit is contained in:
3
Makefile
3
Makefile
@ -448,8 +448,7 @@ lint/ts:
|
||||
lint/go:
|
||||
./scripts/check_enterprise_imports.sh
|
||||
linter_ver=$(shell egrep -o 'GOLANGCI_LINT_VERSION=\S+' dogfood/Dockerfile | cut -d '=' -f 2)
|
||||
go install github.com/golangci/golangci-lint/cmd/golangci-lint@v$$linter_ver
|
||||
golangci-lint run
|
||||
go run github.com/golangci/golangci-lint/cmd/golangci-lint@v$$linter_ver run
|
||||
.PHONY: lint/go
|
||||
|
||||
lint/examples:
|
||||
|
@ -26,7 +26,7 @@ type APIVersion struct {
|
||||
}
|
||||
|
||||
func (v *APIVersion) WithBackwardCompat(majs ...int) *APIVersion {
|
||||
v.additionalMajors = append(v.additionalMajors, majs[:]...)
|
||||
v.additionalMajors = append(v.additionalMajors, majs...)
|
||||
return v
|
||||
}
|
||||
|
||||
|
@ -350,7 +350,7 @@ func (api *API) postWorkspaceProxy(rw http.ResponseWriter, r *http.Request) {
|
||||
Name: req.Name,
|
||||
DisplayName: req.DisplayName,
|
||||
Icon: req.Icon,
|
||||
TokenHashedSecret: hashedSecret[:],
|
||||
TokenHashedSecret: hashedSecret,
|
||||
// Enabled by default, but will be disabled on register if the proxy has
|
||||
// it disabled.
|
||||
DerpEnabled: true,
|
||||
|
Reference in New Issue
Block a user