From: Dessalines <tyhou13@gmx.com>
Date: Thu, 18 Mar 2021 23:36:48 +0000 (-0400)
Subject: Merge branch 'main' into split_user_table
X-Git-Url: http://these/git/%7B%60%24%7BghostArchiveUrl%7D/static/%7B%60%24%7BwebArchiveUrl%7D/save/%7B%60https:/%24%7Bsubmission.url%7D?a=commitdiff_plain;h=c88722983e5c61a2c72075d0303a40618843a7d1;p=lemmy.git

Merge branch 'main' into split_user_table
---

c88722983e5c61a2c72075d0303a40618843a7d1
diff --cc .drone.yml
index bb27984f,c7c2ce30..5c68e2cc
--- a/.drone.yml
+++ b/.drone.yml
@@@ -30,7 -36,7 +36,8 @@@ steps
      environment:
        LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy
        RUST_BACKTRACE: 1
 +      RUST_TEST_THREADS: 1
+       CARGO_HOME: /drone/src/.cargo
      commands:
        - sudo apt-get update
        - sudo apt-get -y install --no-install-recommends espeak postgresql-client
@@@ -108,7 -116,7 +117,8 @@@ steps
      environment:
        LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy
        RUST_BACKTRACE: 1
 +      RUST_TEST_THREADS: 1
+       CARGO_HOME: /drone/src/.cargo
      commands:
        - apt-get update
        - apt-get -y install --no-install-recommends espeak postgresql-client libssl-dev pkg-config libpq-dev