From e7520d45b4f0b54656bc94ddd7454b103e0d6992 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 29 Jan 2024 11:13:29 -0600
Subject: [PATCH] github: use `macos-14`, add new `aarch64-apple-darwin`
 release binary

GitHub announced these new Apple Silicon based runners today. Let's take them
for a spin.

Let's also add an entry in the release matrix to build and publish `aarch64-
apple-darwin` binaries, too. This doesn't migrate the old release matrix entry;
it still uses a `macos-11` runner. This means the x86 binaries should work on a
few older macOS versions if users need it.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .github/workflows/build.yml   | 2 +-
 .github/workflows/release.yml | 7 +++++--
 CHANGELOG.md                  | 3 +++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 923eed172a..5c09350b09 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-13, windows-latest]
+        os: [ubuntu-latest, macos-14, windows-latest]
         cargo_flags: [""]
         include:
         - os: ubuntu-latest
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6457cbab6f..ca30c627f0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -17,14 +17,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        build: [linux-musl, macos, win-msvc]
+        build: [linux-musl, macos-x86_64, macos-aarch64, win-msvc]
         include:
         - build: linux-musl
           os: ubuntu-20.04
           target: x86_64-unknown-linux-musl
-        - build: macos
+        - build: macos-x86_64
           os: macos-11
           target: x86_64-apple-darwin
+        - build: macos-aarch64
+          os: macos-14
+          target: aarch64-apple-darwin
         - build: win-msvc
           os: windows-2022
           target: x86_64-pc-windows-msvc
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad5f766712..ad2232a3ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### New features
 
+* Official binaries for macOS running on Apple Silicon (`aarch64-apple-darwin`)
+  are now available, alongside the existing macOS x86 binaries.
+
 * New `jj op abandon` command is added to clean up the operation history. Git
   refs and commit objects can be further compacted by `jj util gc`.