diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6c38c04540..256cb08fe9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,7 +22,6 @@ testCommit: - pnpm run build - pnpm run migrate - pnpm run test - - pnpm run --filter=backend test:e2e - pnpm run --filter=backend --filter=misskey-js --filter=frontend-shared lint - pnpm run --filter=frontend --filter=frontend-embed eslint cache: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ef08d5275f..4fa52b4094 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -696,7 +696,12 @@ seems to do a decent job) * Commit! * double-check the new migration, that they won't conflict with our db changes: `git diff develop -- packages/backend/migration/` * `pnpm clean; pnpm build` -* run tests `pnpm test; pnpm --filter backend test:e2e` (requires a test database, [see above](#testing)) and fix as much as you can. -* run lint `pnpm --filter=backend --filter=frontend-shared lint` + `pnpm --filter=frontend --filter=frontend-embed eslint` and fix as much as you can. +* run tests `pnpm test; pnpm --filter backend test:e2e` (requires a + test database, [see above](#testing)) and fix them all (the e2e + tests randomly fail with weird errors like `relation "users" does + not exist`, run them again if that happens) +* run lint `pnpm --filter=backend --filter=frontend-shared lint` + + `pnpm --filter=frontend --filter=frontend-embed eslint` and fix all + the problems Then push and open a Merge Request.