From d0f1bffd2d21aa6bdf5578c23d7ce79581b260c6 Mon Sep 17 00:00:00 2001
From: "Peter J. A. Cock"
Date: Mon, 30 Jun 2025 12:57:52 +0900
Subject: [PATCH] Revert "Combine QMK & Vial GitHub Actions" changes.
Sadly the #3 approach failed with a clash in the upload name.
---
.github/workflows/build_binaries.yaml | 14 +++-----------
.github/workflows/build_vial_binaries.yaml | 21 +++++++++++++++++++++
README.md | 6 +++---
3 files changed, 27 insertions(+), 14 deletions(-)
create mode 100644 .github/workflows/build_vial_binaries.yaml
diff --git a/.github/workflows/build_binaries.yaml b/.github/workflows/build_binaries.yaml
index 7b088a36..dcbb3204 100644
--- a/.github/workflows/build_binaries.yaml
+++ b/.github/workflows/build_binaries.yaml
@@ -6,7 +6,7 @@ permissions:
contents: write
jobs:
- build_qmk:
+ build:
name: 'QMK Userspace Build'
uses: qmk/.github/.github/workflows/qmk_userspace_build.yml@main
with:
@@ -14,16 +14,8 @@ 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/Vial Userspace Publish'
+ name: 'QMK Userspace Publish'
uses: qmk/.github/.github/workflows/qmk_userspace_publish.yml@main
if: github.ref == 'refs/heads/main' && always() && !cancelled()
- needs: [build_qmk, build_vial]
+ needs: build
diff --git a/.github/workflows/build_vial_binaries.yaml b/.github/workflows/build_vial_binaries.yaml
new file mode 100644
index 00000000..1e8d41cb
--- /dev/null
+++ b/.github/workflows/build_vial_binaries.yaml
@@ -0,0 +1,21 @@
+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: github.ref == 'refs/heads/main' && always() && !cancelled()
+ needs: build
diff --git a/README.md b/README.md
index bad3b56f..b5835f6b 100644
--- a/README.md
+++ b/README.md
@@ -15,9 +15,9 @@ so that I can experiment with keyboards and layouts without the overhead of the
Here are the [latest compiled firmwares](https://github.com/peterjc/qmk_userspace/releases/tag/latest)
for my keyboards/layout compiled using [QMK Userspace GitHub
Actions](.github/workflows/build_binaries.yaml) with a tweak to the compile new
-keyboards and *both* QMK and Vial layouts. That uses the [Vial fork of the QMK
-firmware](https://github.com/vial-kb/vial-qmk/) repository, and [vial.json](vial.json)
-rather than [qmk.json](qmk.json) lists the layouts to build.
+keyboard(s), and a second workflow to build the Vial layouts against the [Vial fork of
+the QMK firmware](https://github.com/vial-kb/vial-qmk/) repository, where
+[vial.json](vial.json) rather than [qmk.json](qmk.json) lists the layouts to build.
------------------------------------------------------------------------------