From 56681c0feed0c4c143b0de073b362c8ed3c6b3a0 Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Thu, 14 Jul 2022 17:27:51 +0100
Subject: [PATCH] lint as part of test pipeline

---
 .woodpecker/.lint.yml | 10 ----------
 .woodpecker/.test.yml | 17 +++++++----------
 2 files changed, 7 insertions(+), 20 deletions(-)
 delete mode 100644 .woodpecker/.lint.yml

diff --git a/.woodpecker/.lint.yml b/.woodpecker/.lint.yml
deleted file mode 100644
index 0bac90d73..000000000
--- a/.woodpecker/.lint.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-pipeline:
-  lint:
-    image: pleromaforkci/ci-base:1.13
-    commands:
-    - mix local.hex --force
-    - mix local.rebar --force
-    - mix format --check-formatted
-    when:
-      event:
-      - push
diff --git a/.woodpecker/.test.yml b/.woodpecker/.test.yml
index 6724d363d..7434261f9 100644
--- a/.woodpecker/.test.yml
+++ b/.woodpecker/.test.yml
@@ -1,23 +1,23 @@
-depends_on:
-- lint
-
 matrix:
   ELIXIR_VERSION:
   - 1.13
 
 pipeline:
+  lint:
+    image: pleromaforkci/ci-base:1.13
+    commands:
+    - mix local.hex --force
+    - mix local.rebar --force
+    - mix format --check-formatted
+
   build:
     image: pleromaforkci/ci-base:${ELIXIR_VERSION}
     when:
       event:
-      - push
       - pull_request
     environment:
       MIX_ENV: test
     commands:
-    - mix local.hex --force
-    - mix local.rebar --force
-    - mix deps.get
     - mix compile
 
   test:
@@ -25,7 +25,6 @@ pipeline:
     image: pleromaforkci/ci-base:${ELIXIR_VERSION}
     when:
       event:
-      - push
       - pull_request
     environment:
       MIX_ENV: test
@@ -34,8 +33,6 @@ pipeline:
       POSTGRES_PASSWORD: postgres
       DB_HOST: postgres
     commands:
-    - mix local.hex --force
-    - mix local.rebar --force
     - mix ecto.drop -f -q
     - mix ecto.create
     - mix ecto.migrate