From 437b02c8b77266e099ea871740c4a62c3983280c Mon Sep 17 00:00:00 2001
From: Tom Oram <me@tomoram.io>
Date: Fri, 15 May 2026 08:55:09 +0100
Subject: [PATCH 1/2] fix: bump cache action version

---
 cache-cargo-dependencies/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cache-cargo-dependencies/action.yml b/cache-cargo-dependencies/action.yml
index 6df32f7..d81d11d 100644
--- a/cache-cargo-dependencies/action.yml
+++ b/cache-cargo-dependencies/action.yml
@@ -4,7 +4,7 @@ description: A simple wrapper around actions/cache configured with common Cargo
 runs:
   using: composite
   steps:
-    - uses: actions/cache@v4
+    - uses: actions/cache@v5
       name: Cache cargo dependencies
       with:
         key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}

From 00bb7231f2aaf9808d7c832e6e1b3072da6ba41c Mon Sep 17 00:00:00 2001
From: Tom Oram <me@tomoram.io>
Date: Sat, 16 May 2026 20:59:47 +0100
Subject: [PATCH 2/2] feat: add macos arm to determine-binary-name

---
 .../workflows/test-determine-binary-name.yml  | 13 ++++++++++--
 determine-binary-name/action.yml              | 21 +++++++++++++++++--
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test-determine-binary-name.yml b/.github/workflows/test-determine-binary-name.yml
index eaf51b1..5e9eda9 100644
--- a/.github/workflows/test-determine-binary-name.yml
+++ b/.github/workflows/test-determine-binary-name.yml
@@ -14,10 +14,14 @@ jobs:
             expected-name: my-binary.exe
             expected-name-with-arch: my-binary-x86_64-pc-windows-msvc.exe
             expected-suffix: x86_64-pc-windows-msvc
-          - image: macos-latest
+          - image: macos-26-intel
             expected-name: my-binary
             expected-name-with-arch: my-binary-x86_64-apple-darwin
             expected-suffix: x86_64-apple-darwin
+          - image: macos-26
+            expected-name: my-binary
+            expected-name-with-arch: my-binary-aarch64-apple-darwin
+            expected-suffix: aarch64-apple-darwin
     runs-on: ${{ matrix.os.image }}
     steps:
       - uses: actions/checkout@v6
@@ -54,10 +58,14 @@ jobs:
             expected-name: program.exe
             expected-name-with-arch: program-windows.exe
             expected-suffix: windows
-          - image: macos-latest
+          - image: macos-26-intel
             expected-name: program
             expected-name-with-arch: program-macos
             expected-suffix: macos
+          - image: macos-26
+            expected-name: program
+            expected-name-with-arch: program-macos-arm
+            expected-suffix: macos-arm
     runs-on: ${{ matrix.os.image }}
     steps:
       - uses: actions/checkout@v6
@@ -68,6 +76,7 @@ jobs:
           linux-suffix: linux
           windows-suffix: windows
           macos-suffix: macos
+          macos-arm-suffix: macos-arm
       - uses: armakuni/github-actions/assert-equals@v0.19.14
         name: Check name
         with:
diff --git a/determine-binary-name/action.yml b/determine-binary-name/action.yml
index 68a0f6e..6b8ecd4 100644
--- a/determine-binary-name/action.yml
+++ b/determine-binary-name/action.yml
@@ -14,9 +14,13 @@ inputs:
     required: false
     default: x86_64-unknown-linux-gnu
   macos-suffix:
-    description: The suffix to add to Linux binaries
+    description: The suffix to add to macOS binaries
     required: false
     default: x86_64-apple-darwin
+  macos-arm-suffix:
+    description: The suffix to add to macOS ARM binaries
+    required: false
+    default: aarch64-apple-darwin
 
 outputs:
   name:
@@ -39,9 +43,12 @@ runs:
         WINDOWS_SUFFIX: ${{ inputs.windows-suffix }}
         LINUX_SUFFIX: ${{ inputs.linux-suffix }}
         MACOS_SUFFIX: ${{ inputs.macos-suffix }}
+        MACOS_ARM_SUFFIX: ${{ inputs.macos-arm-suffix }}
       run: |
         set -euo pipefail
 
+        echo "RUNNER_OS=$RUNNER_OS"
+
         if [ "$RUNNER_OS" == "Linux" ]; then
           suffix="$LINUX_SUFFIX"
           target_file="$FILENAME"
@@ -51,7 +58,12 @@ runs:
           target_file="$FILENAME.exe"
           source_file="$FILENAME-$suffix.exe"
         elif [ "$RUNNER_OS" == "macOS" ]; then
-          suffix="$MACOS_SUFFIX"
+          echo "\$(uname -m)=$(uname -m)"
+          if [ "$(uname -m)" == "arm64" ]; then
+            suffix="$MACOS_ARM_SUFFIX"
+          else
+            suffix="$MACOS_SUFFIX"
+          fi
           target_file="$FILENAME"
           source_file="$FILENAME-$suffix"
         else
@@ -59,7 +71,12 @@ runs:
           exit 1
         fi
         
+        echo "name-with-arch=$source_file"
         echo "name-with-arch=$source_file" >> "$GITHUB_OUTPUT"
+
+        echo "name=$target_file"
         echo "name=$target_file" >> "$GITHUB_OUTPUT"
+
+        echo "suffix=$suffix"
         echo "suffix=$suffix" >> "$GITHUB_OUTPUT"
       shell: bash