grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove pictrs config section old_db (#4199)

Browse source 
* Remove pictrs config section `old_db` (ref #4194)

* ci

* remove cargo config comment

* ci

* Revert "remove cargo config comment"

This reverts commit 9389e936490ec1a82e5a51a61f61a576201479a8.

* rename .cargo to .cargo_home
This commit is contained in:
Nutomic 2023-11-24 17:26:21 +01:00 committed by GitHub
parent 7d489f1e3f
commit 934fe7d1cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
.woodpecker.yml
View file

@ -60,7 +60,7 @@ steps:
image: rustlang/rust:nightly image: rustlang/rust:nightly
environment: environment:
# store cargo data in repo folder so that it gets cached between steps # store cargo data in repo folder so that it gets cached between steps
CARGO_HOME: .cargo CARGO_HOME: .cargo_home
commands: commands:
# need make existing toolchain available # need make existing toolchain available
- cargo +nightly fmt -- --check - cargo +nightly fmt -- --check
@ -92,7 +92,7 @@ steps:
cache_key: "rust-cache" cache_key: "rust-cache"
path-style: true path-style: true
mount: mount:
- ".cargo" - ".cargo_home"
- "target" - "target"
- "api_tests/node_modules" - "api_tests/node_modules"
secrets: secrets:
@ -103,7 +103,7 @@ steps:
check_api_common_default_features: check_api_common_default_features:
image: *rust_image image: *rust_image
environment: environment:
CARGO_HOME: .cargo CARGO_HOME: .cargo_home
commands: commands:
- cargo check --package lemmy_api_common - cargo check --package lemmy_api_common
when: *slow_check_paths when: *slow_check_paths
@ -111,7 +111,7 @@ steps:
lemmy_api_common_doesnt_depend_on_diesel: lemmy_api_common_doesnt_depend_on_diesel:
image: *rust_image image: *rust_image
environment: environment:
CARGO_HOME: .cargo CARGO_HOME: .cargo_home
commands: commands:
- "! cargo tree -p lemmy_api_common --no-default-features -i diesel" - "! cargo tree -p lemmy_api_common --no-default-features -i diesel"
when: *slow_check_paths when: *slow_check_paths
@ -119,7 +119,7 @@ steps:
lemmy_api_common_works_with_wasm: lemmy_api_common_works_with_wasm:
image: *rust_image image: *rust_image
environment: environment:
CARGO_HOME: .cargo CARGO_HOME: .cargo_home
commands: commands:
- "rustup target add wasm32-unknown-unknown" - "rustup target add wasm32-unknown-unknown"
- "cargo check --target wasm32-unknown-unknown -p lemmy_api_common" - "cargo check --target wasm32-unknown-unknown -p lemmy_api_common"
@ -128,7 +128,7 @@ steps:
check_defaults_hjson_updated: check_defaults_hjson_updated:
image: *rust_image image: *rust_image
environment: environment:
CARGO_HOME: .cargo CARGO_HOME: .cargo_home
commands: commands:
- export LEMMY_CONFIG_LOCATION=./config/config.hjson - export LEMMY_CONFIG_LOCATION=./config/config.hjson
- ./scripts/update_config_defaults.sh config/defaults_current.hjson - ./scripts/update_config_defaults.sh config/defaults_current.hjson
@ -138,7 +138,7 @@ steps:
check_diesel_schema: check_diesel_schema:
image: willsquire/diesel-cli image: willsquire/diesel-cli
environment: environment:
CARGO_HOME: .cargo CARGO_HOME: .cargo_home
DATABASE_URL: postgres://lemmy:password@database:5432/lemmy DATABASE_URL: postgres://lemmy:password@database:5432/lemmy
commands: commands:
- diesel migration run - diesel migration run
@ -149,7 +149,7 @@ steps:
check_diesel_migration_revertable: check_diesel_migration_revertable:
image: willsquire/diesel-cli image: willsquire/diesel-cli
environment: environment:
CARGO_HOME: .cargo CARGO_HOME: .cargo_home
DATABASE_URL: postgres://lemmy:password@database:5432/lemmy DATABASE_URL: postgres://lemmy:password@database:5432/lemmy
commands: commands:
- diesel migration run - diesel migration run
@ -159,7 +159,7 @@ steps:
cargo_clippy: cargo_clippy:
image: *rust_image image: *rust_image
environment: environment:
CARGO_HOME: .cargo CARGO_HOME: .cargo_home
commands: commands:
# when adding new clippy lints, make sure to also add them in scripts/lint.sh # when adding new clippy lints, make sure to also add them in scripts/lint.sh
- rustup component add clippy - rustup component add clippy
@ -169,7 +169,7 @@ steps:
cargo_build: cargo_build:
image: *rust_image image: *rust_image
environment: environment:
CARGO_HOME: .cargo CARGO_HOME: .cargo_home
commands: commands:
- cargo build - cargo build
- mv target/debug/lemmy_server target/lemmy_server - mv target/debug/lemmy_server target/lemmy_server
@ -181,7 +181,7 @@ steps:
environment: environment:
LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy
RUST_BACKTRACE: "1" RUST_BACKTRACE: "1"
CARGO_HOME: .cargo CARGO_HOME: .cargo_home
commands: commands:
- export LEMMY_CONFIG_LOCATION=../../config/config.hjson - export LEMMY_CONFIG_LOCATION=../../config/config.hjson
- cargo test --workspace --no-fail-fast - cargo test --workspace --no-fail-fast
@ -218,7 +218,7 @@ steps:
region: us-east-1 region: us-east-1
path-style: true path-style: true
mount: mount:
- ".cargo" - ".cargo_home"
- "target" - "target"
- "api_tests/node_modules" - "api_tests/node_modules"
secrets: secrets:

3
src/main.rs
View file

@ -22,9 +22,6 @@ pub async fn main() -> Result<(), LemmyError> {
"server": { "server": {
"address": pictrs_address "address": pictrs_address
}, },
"old_db": {
"path": "./pictrs/old"
},
"repo": { "repo": {
"type": "sled", "type": "sled",
"path": "./pictrs/sled-repo" "path": "./pictrs/sled-repo"