From f73c57be55cb44ad43b0a2d230e0a142c815175e Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Fri, 27 Jun 2025 12:23:16 +0100
Subject: [PATCH] feat(builds): update build-emacs-for-macos to 0.6.58 and add
 build variant option

---
 .github/workflows/_build.yml       |  6 ++++++
 .github/workflows/_build_emacs.yml | 10 ++++++++++
 .github/workflows/_prepare.yml     |  2 +-
 .github/workflows/build.yml        |  5 +++++
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/_build.yml b/.github/workflows/_build.yml
index 9b823a5..1d1e7a8 100644
--- a/.github/workflows/_build.yml
+++ b/.github/workflows/_build.yml
@@ -20,6 +20,10 @@ on:
         required: false
         default: ""
         type: string
+      build_variant:
+        description: "Optional build number used as version suffix"
+        required: false
+        type: string
       test_build_name:
         description: "Test build name"
         required: false
@@ -65,6 +69,7 @@ jobs:
       git_ref: ${{ inputs.git_ref }}
       git_sha: ${{ inputs.git_sha }}
       build_args: ${{ inputs.builder_args }}
+      build_variant: ${{ inputs.build_variant }}
       test_build_name: ${{ inputs.test_build_name }}
       test_release_type: ${{ inputs.test_release_type }}
     secrets: inherit
@@ -104,6 +109,7 @@ jobs:
       git_ref: ${{ inputs.git_ref }}
       git_sha: ${{ inputs.git_sha }}
       build_args: ${{ inputs.builder_args }}
+      build_variant: ${{ inputs.build_variant }}
       test_build_name: ${{ inputs.test_build_name }}
       test_release_type: ${{ inputs.test_release_type }}
     secrets: inherit
diff --git a/.github/workflows/_build_emacs.yml b/.github/workflows/_build_emacs.yml
index 2a06b5b..6d4d5a9 100644
--- a/.github/workflows/_build_emacs.yml
+++ b/.github/workflows/_build_emacs.yml
@@ -34,6 +34,10 @@ on:
         description: Custom arguments passed to build script
         type: string
         required: false
+      build_variant:
+        description: "Optional build number used as version suffix"
+        type: string
+        required: false
       test_build_name:
         description: "Test build name"
         type: string
@@ -77,6 +81,11 @@ jobs:
         if: inputs.test_build_name != ''
         run: >-
           echo "args=--test-build '${{ inputs.test_build_name }}' --test-release-type '${{ inputs.test_release_type }}'" >> "$GITHUB_OUTPUT"
+      - name: Prepare build variant args
+        id: build_variant_args
+        if: inputs.build_variant != ''
+        run: >-
+          echo "args=--build-variant ${{ inputs.build_variant }}" >> "$GITHUB_OUTPUT"
       - name: Set git SHA override
         id: emacs_sha
         if: inputs.git_sha != ''
@@ -87,6 +96,7 @@ jobs:
           nix develop --command
           bin/emacs-builder -l debug plan --output build-plan.yml
           --output-dir '${{ github.workspace }}/builds'
+          ${{ steps.build_variant_args.outputs.args }}
           ${{ steps.test_plan_args.outputs.args }}
           ${{ steps.emacs_sha.outputs.sha }}
           '${{ inputs.git_ref }}'
diff --git a/.github/workflows/_prepare.yml b/.github/workflows/_prepare.yml
index a153592..ee368bb 100644
--- a/.github/workflows/_prepare.yml
+++ b/.github/workflows/_prepare.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Default git ref check
         id: ref
         run: |
-          DEFAULT_BUILDER_REF="v0.6.57"
+          DEFAULT_BUILDER_REF="v0.6.58"
           BUILDER_REF="${{ inputs.builder_ref }}"
           echo "ref=${BUILDER_REF:-$DEFAULT_BUILDER_REF}" >> "$GITHUB_OUTPUT"
       - name: Checkout build-emacs-for-macos repo
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ea46b61..171429e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -26,6 +26,10 @@ on:
         description: "prerelease or draft"
         required: false
         default: ""
+      build_variant:
+        description: "Optional build number used as version suffix"
+        required: false
+        type: string
       x86_64:
         description: "Build x86_64 version of Emacs"
         required: false
@@ -46,6 +50,7 @@ jobs:
       git_sha: ${{ inputs.git_sha }}
       builder_ref: ${{ inputs.builder_ref }}
       builder_args: ${{ inputs.builder_args }}
+      build_variant: ${{ inputs.build_variant }}
       test_build_name: ${{ inputs.test_build_name }}
       test_release_type: ${{ inputs.test_release_type }}
       x86_64: ${{ inputs.x86_64 }}