aboutsummaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorBrian Meek <brian@hntlabs.com>2022-04-29 00:55:35 -0700
committerGitHub <noreply@github.com>2022-04-29 08:55:35 +0100
commit1e083794ef0d2968eae9c874e621d199a2b62238 (patch)
tree79fd17ed564943000d0c53ba3061b13454f7abb6 /build
parent26a1512808282c954a141b3376c47b05ef1e6ab4 (diff)
Update golangci-lint, how it's installed, and added to the PATH (#2403)
* switch to dendrite server * minor refactor to merge store code * Fix issue where m.room.name is being filtered by the dendrite server * refresh dendrite main * refresh dendrite main * missing merges from the last dendrite refresh * revert unwanted changes in dendrite.yaml * Update golangci-lint, how it's installed, and added to the PATH Co-authored-by: Tak Wai Wong <takwaiw@gmail.com> Co-authored-by: tak-slashtalk <64229756+tak-slashtalk@users.noreply.github.com>
Diffstat (limited to 'build')
-rwxr-xr-xbuild/scripts/find-lint.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/build/scripts/find-lint.sh b/build/scripts/find-lint.sh
index e3564ae3..820b8cc4 100755
--- a/build/scripts/find-lint.sh
+++ b/build/scripts/find-lint.sh
@@ -25,7 +25,7 @@ echo "Installing golangci-lint..."
# Make a backup of go.{mod,sum} first
cp go.mod go.mod.bak && cp go.sum go.sum.bak
-go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.41.1
+go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.45.2
# Run linting
echo "Looking for lint..."
@@ -33,7 +33,7 @@ echo "Looking for lint..."
# Capture exit code to ensure go.{mod,sum} is restored before exiting
exit_code=0
-PATH="$PATH:${GOPATH:-~/go}/bin" golangci-lint run $args || exit_code=1
+PATH="$PATH:$(go env GOPATH)/bin" golangci-lint run $args || exit_code=1
# Restore go.{mod,sum}
mv go.mod.bak go.mod && mv go.sum.bak go.sum