From bbc63c8f1e926eb3d37023a7426a58d5840425f9 Mon Sep 17 00:00:00 2001
From: "Peter J. A. Cock" <p.j.a.cock@googlemail.com>
Date: Mon, 30 Jun 2025 11:27:45 +0900
Subject: [PATCH] Combine QMK & Vial GitHub Actions (can share publish)

---
 .github/workflows/build_binaries.yaml      | 14 +++++++++++---
 .github/workflows/build_vial_binaries.yaml | 21 ---------------------
 2 files changed, 11 insertions(+), 24 deletions(-)
 delete mode 100644 .github/workflows/build_vial_binaries.yaml

diff --git a/.github/workflows/build_binaries.yaml b/.github/workflows/build_binaries.yaml
index caed33ac..36bb00a9 100644
--- a/.github/workflows/build_binaries.yaml
+++ b/.github/workflows/build_binaries.yaml
@@ -6,7 +6,7 @@ permissions:
   contents: write
 
 jobs:
-  build:
+  build_qmk:
     name: 'QMK Userspace Build'
     uses: qmk/.github/.github/workflows/qmk_userspace_build.yml@main
     with:
@@ -14,8 +14,16 @@ jobs:
       qmk_ref: master
       preparation_command: 'for KB in "$GITHUB_WORKSPACE/keyboards/*/"; do ln -s $KB qmk_firmware/keyboards/ ; done'
 
+  build_vial:
+    name: 'Vial Userspace Build'
+    uses: qmk/.github/.github/workflows/qmk_userspace_build.yml@main
+    with:
+      qmk_repo: vial-kb/vial-qmk
+      qmk_ref: vial
+      preparation_command: 'cp $GITHUB_WORKSPACE/vial.json $GITHUB_WORKSPACE/qmk.json && for KB in "$GITHUB_WORKSPACE/keyboards/*/"; do ln -s $KB qmk_firmware/keyboards/ ; done'
+
   publish:
-    name: 'QMK Userspace Publish'
+    name: 'QMK/Vial Userspace Publish'
     uses: qmk/.github/.github/workflows/qmk_userspace_publish.yml@main
     if: always() && !cancelled()
-    needs: build
+    needs: [build_qmk, build_vial]
diff --git a/.github/workflows/build_vial_binaries.yaml b/.github/workflows/build_vial_binaries.yaml
deleted file mode 100644
index 74d7a097..00000000
--- a/.github/workflows/build_vial_binaries.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: Build Vial firmware
-
-on: [push, workflow_dispatch]
-
-permissions:
-  contents: write
-
-jobs:
-  build:
-    name: 'Vial Userspace Build'
-    uses: qmk/.github/.github/workflows/qmk_userspace_build.yml@main
-    with:
-      qmk_repo: vial-kb/vial-qmk
-      qmk_ref: vial
-      preparation_command: 'cp $GITHUB_WORKSPACE/vial.json $GITHUB_WORKSPACE/qmk.json && for KB in "$GITHUB_WORKSPACE/keyboards/*/"; do ln -s $KB qmk_firmware/keyboards/ ; done'
-
-  publish:
-    name: 'Vial Userspace Publish'
-    uses: qmk/.github/.github/workflows/qmk_userspace_publish.yml@main
-    if: always() && !cancelled()
-    needs: build