From 934fe7d1cb0e012ffca144f8a39ac932c9cc2f70 Mon Sep 17 00:00:00 2001
From: Nutomic <me@nutomic.com>
Date: Fri, 24 Nov 2023 17:26:21 +0100
Subject: [PATCH] Remove pictrs config section `old_db` (#4199)

* 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
---
 .woodpecker.yml | 24 ++++++++++++------------
 src/main.rs     |  3 ---
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 29e5939b5..86f27b213 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -60,7 +60,7 @@ steps:
     image: rustlang/rust:nightly
     environment:
       # store cargo data in repo folder so that it gets cached between steps
-      CARGO_HOME: .cargo
+      CARGO_HOME: .cargo_home
     commands:
       # need make existing toolchain available
       - cargo +nightly fmt -- --check
@@ -92,7 +92,7 @@ steps:
       cache_key: "rust-cache"
       path-style: true
       mount:
-        - ".cargo"
+        - ".cargo_home"
         - "target"
         - "api_tests/node_modules"
     secrets:
@@ -103,7 +103,7 @@ steps:
   check_api_common_default_features:
     image: *rust_image
     environment:
-      CARGO_HOME: .cargo
+      CARGO_HOME: .cargo_home
     commands:
       - cargo check --package lemmy_api_common
     when: *slow_check_paths
@@ -111,7 +111,7 @@ steps:
   lemmy_api_common_doesnt_depend_on_diesel:
     image: *rust_image
     environment:
-      CARGO_HOME: .cargo
+      CARGO_HOME: .cargo_home
     commands:
       - "! cargo tree -p lemmy_api_common --no-default-features -i diesel"
     when: *slow_check_paths
@@ -119,7 +119,7 @@ steps:
   lemmy_api_common_works_with_wasm:
     image: *rust_image
     environment:
-      CARGO_HOME: .cargo
+      CARGO_HOME: .cargo_home
     commands:
       - "rustup target add wasm32-unknown-unknown"
       - "cargo check --target wasm32-unknown-unknown -p lemmy_api_common"
@@ -128,7 +128,7 @@ steps:
   check_defaults_hjson_updated:
     image: *rust_image
     environment:
-      CARGO_HOME: .cargo
+      CARGO_HOME: .cargo_home
     commands:
       - export LEMMY_CONFIG_LOCATION=./config/config.hjson
       - ./scripts/update_config_defaults.sh config/defaults_current.hjson
@@ -138,7 +138,7 @@ steps:
   check_diesel_schema:
     image: willsquire/diesel-cli
     environment:
-      CARGO_HOME: .cargo
+      CARGO_HOME: .cargo_home
       DATABASE_URL: postgres://lemmy:password@database:5432/lemmy
     commands:
       - diesel migration run
@@ -149,7 +149,7 @@ steps:
   check_diesel_migration_revertable:
     image: willsquire/diesel-cli
     environment:
-      CARGO_HOME: .cargo
+      CARGO_HOME: .cargo_home
       DATABASE_URL: postgres://lemmy:password@database:5432/lemmy
     commands:
       - diesel migration run
@@ -159,7 +159,7 @@ steps:
   cargo_clippy:
     image: *rust_image
     environment:
-      CARGO_HOME: .cargo
+      CARGO_HOME: .cargo_home
     commands:
       # when adding new clippy lints, make sure to also add them in scripts/lint.sh
       - rustup component add clippy
@@ -169,7 +169,7 @@ steps:
   cargo_build:
     image: *rust_image
     environment:
-      CARGO_HOME: .cargo
+      CARGO_HOME: .cargo_home
     commands:
       - cargo build
       - mv target/debug/lemmy_server target/lemmy_server
@@ -181,7 +181,7 @@ steps:
     environment:
       LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy
       RUST_BACKTRACE: "1"
-      CARGO_HOME: .cargo
+      CARGO_HOME: .cargo_home
     commands:
       - export LEMMY_CONFIG_LOCATION=../../config/config.hjson
       - cargo test --workspace --no-fail-fast
@@ -218,7 +218,7 @@ steps:
       region: us-east-1
       path-style: true
       mount:
-        - ".cargo"
+        - ".cargo_home"
         - "target"
         - "api_tests/node_modules"
     secrets:
diff --git a/src/main.rs b/src/main.rs
index 85d74fb13..1544bcecf 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -22,9 +22,6 @@ pub async fn main() -> Result<(), LemmyError> {
         "server": {
             "address": pictrs_address
         },
-        "old_db": {
-            "path": "./pictrs/old"
-        },
         "repo": {
             "type": "sled",
             "path": "./pictrs/sled-repo"