From 6b4bd441a3bea0caef102bbb58b590c86009c000 Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Sun, 19 Nov 2023 22:54:40 +0000
Subject: [PATCH] fix(build): pass inputs correctly

---
 .github/workflows/_prepare.yml                      |  6 ++----
 ...nthly-master.yml => build-master-multi-arch.yml} |  4 +++-
 .../{nightly-master.yml => build-master-x86_64.yml} |  4 +++-
 .github/workflows/build.yml                         | 13 +++++--------
 4 files changed, 13 insertions(+), 14 deletions(-)
 rename .github/workflows/{monthly-master.yml => build-master-multi-arch.yml} (91%)
 rename .github/workflows/{nightly-master.yml => build-master-x86_64.yml} (91%)

diff --git a/.github/workflows/_prepare.yml b/.github/workflows/_prepare.yml
index 9ff409f..4705f5d 100644
--- a/.github/workflows/_prepare.yml
+++ b/.github/workflows/_prepare.yml
@@ -6,13 +6,11 @@ on:
       os:
         description: GitHub Actions runner OS
         type: string
-        required: false
-        default: "macos-11"
+        required: true
       builder_ref:
         description: Git ref to checkout of build-emacs-for-macos
-        required: false
+        required: true
         type: string
-        default: "v0.6.43"
     secrets:
       TAP_REPO_TOKEN:
         description: Personal Access Token for Homebrew Tap repo
diff --git a/.github/workflows/monthly-master.yml b/.github/workflows/build-master-multi-arch.yml
similarity index 91%
rename from .github/workflows/monthly-master.yml
rename to .github/workflows/build-master-multi-arch.yml
index bac201b..3e579cd 100644
--- a/.github/workflows/monthly-master.yml
+++ b/.github/workflows/build-master-multi-arch.yml
@@ -1,5 +1,5 @@
 ---
-name: Monthly (master)
+name: Build (master, multi-arch)
 on:
   schedule:
     - cron: "0 23 1 * *"
@@ -16,6 +16,8 @@ jobs:
     with:
       git_ref: master
       git_sha: ${{ github.event.inputs.git_sha }}
+      builder_ref: "v0.6.43"
+      os: macos-11
       x86_64: true
       arm64: true
     secrets:
diff --git a/.github/workflows/nightly-master.yml b/.github/workflows/build-master-x86_64.yml
similarity index 91%
rename from .github/workflows/nightly-master.yml
rename to .github/workflows/build-master-x86_64.yml
index 4f0d0d4..d7a1728 100644
--- a/.github/workflows/nightly-master.yml
+++ b/.github/workflows/build-master-x86_64.yml
@@ -1,5 +1,5 @@
 ---
-name: Nightly (master)
+name: Build (master, x86_64)
 on:
   schedule:
     - cron: "0 23 2-31 * *"
@@ -16,6 +16,8 @@ jobs:
     with:
       git_ref: master
       git_sha: ${{ github.event.inputs.git_sha }}
+      builder_ref: "v0.6.43"
+      os: macos-11
       x86_64: true
       arm64: false
     secrets:
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f4afd29..ab46497 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -44,8 +44,7 @@ on:
     inputs:
       git_ref:
         description: Emacs git ref to build
-        required: false
-        default: "master"
+        required: true
         type: string
       git_sha:
         description: Override Emacs git commit SHA to build
@@ -54,8 +53,7 @@ on:
         type: string
       builder_ref:
         description: "Git ref to checkout of build-emacs-for-macos"
-        required: false
-        default: "master"
+        required: true
         type: string
       builder_args:
         description: Custom arguments passed to build script
@@ -64,8 +62,7 @@ on:
         type: string
       os:
         description: 'Runner OS ("macos-11", "macos-12", or "macos-latest")'
-        required: false
-        default: "macos-11"
+        required: true
         type: string
       test_build_name:
         description: "Test build name"
@@ -79,12 +76,12 @@ on:
         type: string
       x86_64:
         description: "Build x86_64 version of Emacs"
-        required: false
+        required: true
         default: true
         type: boolean
       arm64:
         description: "Build arm64 version of Emacs"
-        required: false
+        required: true
         default: false
         type: boolean
     secrets: