From 7c260e4acb4410a0497a3cf1e6e2525226a5d085 Mon Sep 17 00:00:00 2001
From: Pim van der Loos <pimvanderloos@gmail.com>
Date: Fri, 29 Aug 2025 16:41:19 +0200
Subject: [PATCH] Do not run regular build on merge

- We already have our build/test/sign task for post-merge, no need to run build/test as well.
---
 .github/workflows/{sign-upload.yml => build-sign.yml} | 3 ++-
 .github/workflows/build.yml                           | 3 ---
 2 files changed, 2 insertions(+), 4 deletions(-)
 rename .github/workflows/{sign-upload.yml => build-sign.yml} (95%)

diff --git a/.github/workflows/sign-upload.yml b/.github/workflows/build-sign.yml
similarity index 95%
rename from .github/workflows/sign-upload.yml
rename to .github/workflows/build-sign.yml
index 3360405..bb02a13 100644
--- a/.github/workflows/sign-upload.yml
+++ b/.github/workflows/build-sign.yml
@@ -1,4 +1,4 @@
-name: Build, sign, and upload
+name: Build, test, sign, and upload
 
 on:
   push:
@@ -32,6 +32,7 @@ jobs:
             -Psign \
             -Dgpg.keyname=6C063BAA00065DFED08D7CD6B21CB73DBBF60FE5 \
             clean \
+            test \
             verify
 
       - name: Upload build artifacts (JARs + .asc)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2c8fde8..d933f31 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,9 +1,6 @@
 name: Build and Test
 
 on:
-  push:
-    branches:
-      - master
   pull_request:
     branches:
       - master