mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-21 13:53:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into kegan/awsy-docs

Browse source
This commit is contained in:
Kegan Dougal 2020-08-24 19:09:19 +01:00
parent 6505a676f8 466d795375
commit 99e1969e2d
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/CODE_STYLE.md
View file

@ -12,9 +12,9 @@ directive](https://github.com/golangci/golangci-lint#nolint), e.g. `var
bad_name int //nolint:golint,unused`. This should be used sparingly and only bad_name int //nolint:golint,unused`. This should be used sparingly and only
when its clear that the lint warning is spurious. when its clear that the lint warning is spurious.
The linters can be run using [scripts/find-lint.sh](scripts/find-lint.sh) The linters can be run using [build/scripts/find-lint.sh](/build/scripts/find-lint.sh)
(see file for docs) or as part of a build/test/lint cycle using (see file for docs) or as part of a build/test/lint cycle using
[scripts/build-test-lint.sh](scripts/build-test-lint.sh). [build/scripts/build-test-lint.sh](/build/scripts/build-test-lint.sh).
## Labels ## Labels

2
docs/CONTRIBUTING.md
View file

@ -49,7 +49,7 @@ To save waiting for CI to finish after every commit, it is ideal to run the
checks locally before pushing, fixing errors first. This also saves other people checks locally before pushing, fixing errors first. This also saves other people
time as only so many PRs can be tested at a given time. time as only so many PRs can be tested at a given time.
To execute what Buildkite tests, first run `./scripts/build-test-lint.sh`; this To execute what Buildkite tests, first run `./build/scripts/build-test-lint.sh`; this
script will build the code, lint it, and run `go test ./...` with race condition script will build the code, lint it, and run `go test ./...` with race condition
checking enabled. If something needs to be changed, fix it and then run the checking enabled. If something needs to be changed, fix it and then run the
script again until it no longer complains. Be warned that the linting can take a script again until it no longer complains. Be warned that the linting can take a