From a748d871cf376d3548a845ba85163b7eb5cb7057 Mon Sep 17 00:00:00 2001
From: Drashna Jael're <drashna@live.com>
Date: Sat, 1 Jun 2024 18:06:26 -0700
Subject: [PATCH] [GitHub] Fix workflow actions

---
 .github/workflows/qmk_userspace_build.yml   | 10 ++++++++++
 .github/workflows/qmk_userspace_publish.yml |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/qmk_userspace_build.yml b/.github/workflows/qmk_userspace_build.yml
index fe438c1751..2464121da5 100644
--- a/.github/workflows/qmk_userspace_build.yml
+++ b/.github/workflows/qmk_userspace_build.yml
@@ -13,6 +13,11 @@ on:
         default: "master"
         required: false
         type: string
+      preparation_command:
+        description: "command to execute before `qmk userspace-compile`"
+        default: ""
+        required: false
+        type: string
 
 permissions:
   contents: write
@@ -61,6 +66,11 @@ jobs:
         run: |
           qmk userspace-doctor
 
+      - name: Preparation command
+        if: inputs.preparation_command != ''
+        run: |
+          ${{ inputs.preparation_command }}
+
       - name: Build
         run: |
           qmk userspace-compile -e DUMP_CI_METADATA=yes || touch .failed
diff --git a/.github/workflows/qmk_userspace_publish.yml b/.github/workflows/qmk_userspace_publish.yml
index 249d581792..49b9688f4a 100644
--- a/.github/workflows/qmk_userspace_publish.yml
+++ b/.github/workflows/qmk_userspace_publish.yml
@@ -5,7 +5,7 @@ on:
     inputs:
       release_name:
         description: "allow setting the release name"
-        default: "latest"
+        default: "latest_${{ inputs.qmk_ref }}"
         required: false
         type: string
       qmk_ref:
@@ -43,7 +43,7 @@ jobs:
         with:
           token: ${{ github.token }}
           name: Latest QMK Firmware
-          tag_name: ${{ inputs.release_name || 'latest_${{ inputs.qmk_ref }}' }}
+          tag_name: ${{ inputs.release_name || 'latest' }}
           fail_on_unmatched_files: false
           draft: false
           prerelease: false