From 55c71cb3bcf0740d5046bfbe39a95110916abd7b Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Fri, 26 Jan 2024 11:28:40 +0100
Subject: [PATCH] install postgres

---
 .woodpecker.yml | 13 ++++++++-----
 tests/common.rs |  4 ++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index bffed32..0069fdf 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,7 +1,9 @@
-steps:
+variables:
+  - &rust_image "rust:1.75"
 
+steps:
   cargo_fmt:
-    image: rust:1.75
+    image: *rust_image
     environment:
       # store cargo data in repo folder so that it gets cached between steps
       CARGO_HOME: .cargo_home
@@ -10,7 +12,7 @@ steps:
       - cargo fmt -- --check
 
   frontend_wasm_build:
-    image: rust:1.75
+    image: *rust_image
     environment:
       CARGO_HOME: .cargo_home
     commands:
@@ -28,7 +30,7 @@ steps:
       - diff tmp.schema src/backend/database/schema.rs
 
   cargo_clippy:
-    image: rust:1.75
+    image: *rust_image
     environment:
       CARGO_HOME: .cargo_home
     commands:
@@ -36,12 +38,13 @@ steps:
       - cargo clippy --tests --all-targets --all-features
 
   cargo_test:
-    image: rust:1.75
+    image: *rust_image
     environment:
       LEMMY_DATABASE_URL: postgres://ibis:password@database:5432/ibis
       RUST_BACKTRACE: "1"
       CARGO_HOME: .cargo_home
     commands:
+      - apt install postgresql
       - cargo test --no-fail-fast
 
 services:
diff --git a/tests/common.rs b/tests/common.rs
index 47a1d85..f42658f 100644
--- a/tests/common.rs
+++ b/tests/common.rs
@@ -95,8 +95,8 @@ impl IbisInstance {
         spawn(move || {
             Command::new("./tests/scripts/start_dev_db.sh")
                 .arg(&db_path)
-                .stdout(Stdio::null())
-                .stderr(Stdio::null())
+                .stdout(Stdio::inherit())
+                .stderr(Stdio::inherit())
                 .output()
                 .unwrap();
         })