diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 923eed172..5c09350b0 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 6457cbab6..ca30c627f 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 ad5f76671..ad2232a3e 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`.