github: build on macos-13 for x86_64

We all noticed that x86 macOS binaries are no longer being provided on release,
due to `macos-11` runners going the way of the Dodo a while back. Nobody
alterted us to this, funny enough.

After some quick discussion, we concluded some things:

- x86 macOS runners are likely oversubscribed, and hurt CI latency badly
- `macos-12` is also deprecated; `macos-13` is the best x86 runner available
- GitHub probably isn't going to expand macOS runner capacity; `macos-13` will
one day go away
- Some people are still using `jj` on Intel Macs. We didn't get alerted because
they do their own builds for now, but may not always do that.
- We can just try to build on `macos-13` and make it optional for merges.

So that's what this does. It might be mergeable outright, but we can also use it
to measure build latency impacts.

Signed-off-by: Austin Seipp <[email protected]>

.github/workflows/build-binaries.yml

@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
 
       matrix:
-        build: [linux-x86_64-musl, linux-x86_64-gnu, linux-aarch64-musl, linux-aarch64-gnu, macos-aarch64, win-x86_64]
+        build: [linux-x86_64-musl, linux-x86_64-gnu, linux-aarch64-musl, linux-aarch64-gnu, macos-x86_64, macos-aarch64, win-x86_64]
         include:
         - build: linux-x86_64-musl
           os: ubuntu-24.04
@@ -27,6 +27,9 @@ jobs:
         - build: linux-aarch64-gnu
           os: ubuntu-24.04
           target: aarch64-unknown-linux-gnu
+        - build: macos-x86_64
+          os: macos-13
+          target: x86_64-apple-darwin
         - build: macos-aarch64
           os: macos-14
           target: aarch64-apple-darwin

.github/workflows/build.yml

@@ -15,7 +15,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-14, windows-latest]
+        # macos-13 is x86; macos-14 is ARM
+        os: [ubuntu-latest, macos-13, macos-14, windows-latest]
         cargo_flags: [""]
         include:
         - os: ubuntu-latest

.github/workflows/release.yml

@@ -26,7 +26,7 @@ jobs:
           os: ubuntu-24.04
           target: aarch64-unknown-linux-musl
         - build: macos-x86_64
-          os: macos-11
+          os: macos-13
           target: x86_64-apple-darwin
         - build: macos-aarch64
           os: macos-14

CHANGELOG.md

@@ -23,6 +23,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ### Fixed bugs
 
+* Release binaries for Intel Macs have been restored. They were previously
+  broken due to using a sunset version of GitHub's macOS runners (but nobody had
+  previously complained.)
+
 ## [0.20.0] - 2024-08-07
 
 ### Note to packagers