From 070a70c0b86138bcf625b2b6ac53d7a7dbe1f093 Mon Sep 17 00:00:00 2001
From: Lars Hampe <hello@hashdot.co>
Date: Tue, 1 Oct 2024 19:00:39 +0200
Subject: [PATCH] ci: refactor workflows

---
 .gitea/workflows/branches.yaml                | 14 +++++++++
 .../{build_and_push.yaml => main.yaml}        | 30 ++-----------------
 .gitea/workflows/test.yaml                    |  6 +---
 3 files changed, 18 insertions(+), 32 deletions(-)
 create mode 100644 .gitea/workflows/branches.yaml
 rename .gitea/workflows/{build_and_push.yaml => main.yaml} (61%)

diff --git a/.gitea/workflows/branches.yaml b/.gitea/workflows/branches.yaml
new file mode 100644
index 0000000..71be1d8
--- /dev/null
+++ b/.gitea/workflows/branches.yaml
@@ -0,0 +1,14 @@
+name: Build and Push Docker Image
+run-name: ${{ gitea.actor }}
+on:
+  push:
+    branches:
+      - "!main"
+      - "**/*"
+
+jobs:
+  tests:
+    uses: ./.gitea/workflows/test.yaml
+  build:
+    needs: [tests]
+    runs-on: ubuntu-latest
\ No newline at end of file
diff --git a/.gitea/workflows/build_and_push.yaml b/.gitea/workflows/main.yaml
similarity index 61%
rename from .gitea/workflows/build_and_push.yaml
rename to .gitea/workflows/main.yaml
index 49307d0..4ae029d 100644
--- a/.gitea/workflows/build_and_push.yaml
+++ b/.gitea/workflows/main.yaml
@@ -6,25 +6,11 @@ on:
       - main
 
 jobs:
+  tests:
+    uses: ./.gitea/workflows/test.yaml
   build:
+    needs: [tests]
     runs-on: ubuntu-latest
-    services:
-      postgres:
-        image: postgres:17-alpine
-
-        env:
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_USER: postgres
-          POSTGRES_DB: postgres
-
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        ports:
-          - 5432:5432
-
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -39,16 +25,6 @@ jobs:
       - name: Install dependencies
         run: bun install
 
-      - name: Push Database - Test
-        run: bun run db:push
-        env:
-          POSTGRES_URL: postgres://postgres:postgres@postgres:5432/postgres
-      
-      - name: Test API
-        run: bun test:api
-        env:
-          POSTGRES_URL: postgres://postgres:postgres@postgres:5432/postgres
-
       - name: Build
         run: bun run build
         env:
diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml
index 8859103..16bb341 100644
--- a/.gitea/workflows/test.yaml
+++ b/.gitea/workflows/test.yaml
@@ -1,10 +1,6 @@
 name: Test
 run-name: ${{ gitea.actor }}
-on:
-  push:
-    branches:
-      - '**/*'
-      - '!main'
+on: [workflow_call]
 
 jobs:
   build: