From 6f1fc9f8de9f1e5899e1a000b114f537c16ac845 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 27 Feb 2022 23:00:07 +0100
Subject: [PATCH] CI: Run 'test' workflow as part of the 'deploy-branch'
 workflow

Mimics the behaviour of the 'deploy-release' workflow, even though branch deployment doesn't depend on Pico's tests to succeed. Pull requests still use the 'test' workflow directly.
---
 .github/workflows/deploy-branch.yml | 4 ++++
 .github/workflows/test.yml          | 2 --
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy-branch.yml b/.github/workflows/deploy-branch.yml
index c8fd01b..a6ee7ad 100644
--- a/.github/workflows/deploy-branch.yml
+++ b/.github/workflows/deploy-branch.yml
@@ -12,6 +12,10 @@ env:
     CI_TOOLS_SETUP: https://raw.githubusercontent.com/picocms/ci-tools/master/setup.sh
 
 jobs:
+    test:
+        name: Test Pico CMS
+        uses: ./.github/workflows/test.yml
+
     website:
         name: Update website for branch updates
 
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index cf8cb47..d618b02 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,8 +1,6 @@
 name: Test Pico CMS
 
 on:
-    push:
-        branches: [ 'master' ]
     pull_request: {}
     workflow_call: {}