From 1375d324297c058fc2388a2beccfab452b25b5b2 Mon Sep 17 00:00:00 2001
From: "Stanislav N. aka pztrn" <pztrn@pztrn.name>
Date: Sat, 12 Oct 2024 15:49:00 +0500
Subject: [PATCH] Final Gitea Actions fixes.

---
 .gitea/workflows/lint-and-test.yaml | 26 --------------------------
 .gitea/workflows/on-push.yaml       | 22 +++++++++++++++++++---
 2 files changed, 19 insertions(+), 29 deletions(-)
 delete mode 100644 .gitea/workflows/lint-and-test.yaml

diff --git a/.gitea/workflows/lint-and-test.yaml b/.gitea/workflows/lint-and-test.yaml
deleted file mode 100644
index 0be200b..0000000
--- a/.gitea/workflows/lint-and-test.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-name: "Linting and tests"
-run-name: "Linting and tests"
-on:
-  workflow_call:
-
-jobs:
-  Linting:
-    runs-on: "ubuntu-22.04"
-    steps:
-      - name: "checkout source"
-        uses: actions/checkout@v4
-      - name: "lint"
-        uses: docker://code.pztrn.name/containers/go-toolbox:v4
-        with:
-          command: "/usr/local/bin/task lint"
-
-  Tests:
-    runs-on: "ubuntu-22.04"
-    steps:
-      - name: "checkout source"
-        uses: actions/checkout@v4
-      - name: "tests"
-        uses: docker://code.pztrn.name/containers/go-toolbox:v4
-        with:
-          command: "/usr/local/bin/task test"
diff --git a/.gitea/workflows/on-push.yaml b/.gitea/workflows/on-push.yaml
index 60ad342..79c7973 100644
--- a/.gitea/workflows/on-push.yaml
+++ b/.gitea/workflows/on-push.yaml
@@ -5,6 +5,22 @@ on:
   - push
 
 jobs:
-  LintAndTest:
-    uses: ./.gitea/workflows/lint-and-test.yaml
-    secrets: inherit
+  Linting:
+    runs-on: "ubuntu-22.04"
+    steps:
+      - name: "checkout source"
+        uses: actions/checkout@v4
+      - name: "lint"
+        uses: docker://code.pztrn.name/containers/go-toolbox:v4
+        with:
+          command: "/usr/local/bin/task lint"
+
+  Tests:
+    runs-on: "ubuntu-22.04"
+    steps:
+      - name: "checkout source"
+        uses: actions/checkout@v4
+      - name: "tests"
+        uses: docker://code.pztrn.name/containers/go-toolbox:v4
+        with:
+          command: "/usr/local/bin/task test"