From 637a789897596c80c954df57c15edcff3297f409 Mon Sep 17 00:00:00 2001
From: "t.behrendt" <t.behrendt@t00n.de>
Date: Sun, 11 Aug 2024 12:36:33 +0200
Subject: [PATCH] fix: revert cicd changes (#14)

---
 .gitea/workflows/cd.yaml | 44 ++++++++++++++++++++++++++++++++++------
 .gitea/workflows/ci.yaml |  6 +-----
 2 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/.gitea/workflows/cd.yaml b/.gitea/workflows/cd.yaml
index d7993f1..3129b36 100644
--- a/.gitea/workflows/cd.yaml
+++ b/.gitea/workflows/cd.yaml
@@ -1,20 +1,52 @@
 name: CD
 
 on:
-  workflow_run:
-    workflows: ["ci.yaml"]
-    branches: [main]
-    types:
-      - completed
+  push:
+    branches:
+      - main
 
 env:
   DOCKER_REGISTRY: gitea.t000-n.de
 
 jobs:
+  test:
+    name: test
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup go
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: go.mod
+          check-latest: true
+      - name: Create cache key
+        uses: https://gitea.com/actions/go-hashfiles@v0.0.1
+        id: hash-go
+        with:
+          patterns: |
+            go.mod
+            go.sum
+      - name: cache go
+        id: cache-go
+        uses: actions/cache@v4
+        with:
+          path: |
+            /go_path
+            /go_cache
+          key: go_path-${{ steps.hash-go.outputs.hash }}
+          restore-keys: |-
+            go_cache-${{ steps.hash-go.outputs.hash }}
+      - name: build
+        run: make build
+      - name: test
+        run: make test
+
   build_and_push:
     name: Build and push
+    needs:
+      - test
     runs-on: ubuntu-latest
-    if: ${{ github.event.workflow_run.conclusion == 'success' }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml
index 28b7169..dac1a20 100644
--- a/.gitea/workflows/ci.yaml
+++ b/.gitea/workflows/ci.yaml
@@ -1,10 +1,6 @@
 name: CI
-
 on:
   pull_request:
-  push:
-    branches:
-      - main
 
 env:
   GOPATH: /go_path
@@ -39,7 +35,7 @@ jobs:
             /go_cache
           key: go_path-${{ steps.hash-go.outputs.hash }}
           restore-keys: |-
-            go_cache-${{ steps.hash-go.outputs.hash }}
+            go_cache-${{ steps.hash-go.outputs.hash }}      
       - name: build
         run: make build
       - name: test