Skip to content

Commit

Permalink
Merge branch 'LemmyNet:main' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
kroese authored Nov 14, 2024
2 parents cf8029e + a9d6d4e commit 6256d5f
Show file tree
Hide file tree
Showing 35 changed files with 636 additions and 372 deletions.
22 changes: 11 additions & 11 deletions .woodpecker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,17 +138,6 @@ steps:
- diff tmp.schema crates/db_schema/src/schema.rs
when: *slow_check_paths

check_db_perf_tool:
image: *rust_image
environment:
LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy
RUST_BACKTRACE: "1"
CARGO_HOME: .cargo_home
commands:
# same as scripts/db_perf.sh but without creating a new database server
- cargo run --package lemmy_db_perf -- --posts 10 --read-post-pages 1
when: *slow_check_paths

cargo_clippy:
image: *rust_image
environment:
Expand Down Expand Up @@ -221,6 +210,17 @@ steps:
- diff before.sqldump after.sqldump
when: *slow_check_paths

check_db_perf_tool:
image: *rust_image
environment:
LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy
RUST_BACKTRACE: "1"
CARGO_HOME: .cargo_home
commands:
# same as scripts/db_perf.sh but without creating a new database server
- cargo run --package lemmy_db_perf -- --posts 10 --read-post-pages 1
when: *slow_check_paths

run_federation_tests:
image: node:22-bookworm-slim
environment:
Expand Down
12 changes: 6 additions & 6 deletions api_tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@
},
"devDependencies": {
"@types/jest": "^29.5.12",
"@types/node": "^22.3.0",
"@typescript-eslint/eslint-plugin": "^8.1.0",
"@typescript-eslint/parser": "^8.1.0",
"eslint": "^9.9.0",
"@types/node": "^22.9.0",
"@typescript-eslint/eslint-plugin": "^8.13.0",
"@typescript-eslint/parser": "^8.13.0",
"eslint": "^9.14.0",
"eslint-plugin-prettier": "^5.1.3",
"jest": "^29.5.0",
"lemmy-js-client": "0.20.0-private-community.9",
"lemmy-js-client": "0.20.0-alpha.18",
"prettier": "^3.2.5",
"ts-jest": "^29.1.0",
"typescript": "^5.5.4",
"typescript-eslint": "^8.1.0"
"typescript-eslint": "^8.13.0"
}
}
Loading

0 comments on commit 6256d5f

Please sign in to comment.