summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordakkar <dakkar@thenautilus.net>2024-04-25 11:56:35 +0100
committerdakkar <dakkar@thenautilus.net>2024-04-25 11:56:35 +0100
commit158a9b3692c91c38a647ceda54e6e229698aff77 (patch)
treeb25aa07100a1a21745320004241ef498b1cad4d4
parentfix backend tests (diff)
downloadsharkey-158a9b3692c91c38a647ceda54e6e229698aff77.tar.gz
sharkey-158a9b3692c91c38a647ceda54e6e229698aff77.tar.bz2
sharkey-158a9b3692c91c38a647ceda54e6e229698aff77.zip
update merge guide
-rw-r--r--CONTRIBUTING.md3
1 files changed, 3 insertions, 0 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 25e259a285..d40a518ec0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -564,6 +564,9 @@ seems to do a decent job)
* from `MkNote*` to `SkNote*` (if sensible)
* re-generate `misskey-js`: `pnpm build-misskey-js-with-types`
* run tests `pnpm test` and fix as much as you can
+ * right now `megalodon` doesn't pass its tests, you probably need to
+ run `pnpm --filter=backend test` (requires a test database, [see
+ above](#testing)) and `pnpm --filter=frontend test`
* run lint `pnpm --filter=backend lint` + `pnpm --filter=frontend
eslint` and fix as much as you can