From f18de98545d2de1548d5e55300d39dd40f96936f Mon Sep 17 00:00:00 2001
From: Roy Crihfield <roy@manteia.ltd>
Date: Thu, 14 Sep 2023 20:19:54 +0800
Subject: [PATCH] run test jobs directly

---
 .github/workflows/on-pr.yml |  6 ------
 .github/workflows/test.yml  | 12 +++++++++++-
 2 files changed, 11 insertions(+), 7 deletions(-)
 delete mode 100644 .github/workflows/on-pr.yml

diff --git a/.github/workflows/on-pr.yml b/.github/workflows/on-pr.yml
deleted file mode 100644
index b92f11b..0000000
--- a/.github/workflows/on-pr.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: Run tests for PR
-on: [pull_request]
-
-jobs:
-  run-tests:
-    uses: ./.github/workflows/test.yml
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 201009c..1a9fcc1 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,6 +1,16 @@
 name: Unit and integration tests
 on:
-  workflow_call:
+  # workflow_call:
+
+  # Job headers are hidden when not top-level - run them directly for readability until fixed:
+  # https://github.com/go-gitea/gitea/issues/26736
+  pull_request:
+    branches: '*'
+  push:
+    branches:
+      - main
+      - ci-test
+
 
 env:
   # Needed until we can incorporate docker startup into the executor container