chore(deps): update build-emacs-for-macos to 0.6.57

Allow the default builder_ref to be set in the a single location, the
_prepare shared workflow. Other workflows essentially have a override
option, and no longer need explicit default values set.

.github/workflows/_build.yml

@@ -1,233 +1,145 @@
 ---
-# Requires _prepare.yml re-usable workflow to have run.
 name: _build
 on:
   workflow_call:
     inputs:
-      artifact_prefix:
-        description: Artifact prefix
-        type: string
-        required: false
-      os:
-        description: GitHub Actions runner OS
-        type: string
-        required: true
       git_ref:
-        description: Git ref to build
-        type: string
+        description: Emacs git ref to build
         required: true
-      git_sha:
-        description: Override git SHA to build
         type: string
+      git_sha:
+        description: Override Emacs git commit SHA to build
         required: false
+        type: string
+      builder_ref:
+        description: "Git ref to checkout of build-emacs-for-macos"
+        required: false
+        type: string
+      builder_args:
+        description: Custom arguments passed to build script
+        required: false
+        default: ""
+        type: string
       test_build_name:
         description: "Test build name"
-        type: string
         required: false
+        default: ""
+        type: string
       test_release_type:
         description: "prerelease or draft"
-        type: string
         required: false
-        default: "prerelease"
-    secrets:
-      APPLE_DEVELOPER_CERTIFICATE_P12_BASE64:
-        description: Base64 encoded Apple Developer Certificate
-        required: true
-      APPLE_DEVELOPER_CERTIFICATE_PASSWORD:
-        description: Password for Apple Developer Certificate
-        required: true
-      KEYCHAIN_PASSWORD:
-        description: Password to use for temporary local keychain on runner
-        required: true
-      AC_USERNAME:
-        description: Apple Connect Username
-        required: true
-      AC_PASSWORD:
-        description: Apple Connect Password
-        required: true
-      AC_PROVIDER:
-        description: Apple Connect Provider
-        required: true
-      AC_SIGN_IDENTITY:
-        description: Apple Connect Signing Identify
-        required: true
-      TAP_REPO_TOKEN:
-        description: Homebrew Tap Token
-        required: true
+        default: ""
+        type: string
+      x86_64:
+        description: "Build x86_64 version of Emacs"
+        required: false
+        default: true
+        type: boolean
+      arm64:
+        description: "Build arm64 version of Emacs"
+        required: false
+        default: true
+        type: boolean
 
 jobs:
   prepare:
-    runs-on: ${{ inputs.os }}
-    outputs:
-      builder_sha: ${{ steps.builder_sha.outputs.sha }}
-      emacs_sha_override: ${{ steps.emacs_sha.outputs.sha }}
-      test_plan_args: ${{ steps.test_plan_args.outputs.args }}
-    steps:
-      - name: Download emacs-builder git SHA artifact
-        uses: actions/download-artifact@v2
-        with:
-          name: emacs-builder-git-sha
-          path: ./
-      - name: Store builder Git SHA
-        id: builder_sha
-        run: >-
-          echo "::set-output name=sha::$(cat emacs-builder-git-sha.txt)"
-      - name: Prepare plan test args
-        id: test_plan_args
-        if: ${{ inputs.test_build_name != '' }}
-        run: >-
-          echo "::set-output name=args::--test-build '${{ inputs.test_build_name }}' --test-release-type '${{ inputs.test_release_type }}'"
-      - name: Set git SHA override
-        id: emacs_sha
-        if: ${{ inputs.git_sha != '' }}
-        run: >-
-          echo "::set-output name=sha::--sha '${{ inputs.git_sha }}'"
+    name: Prepare
+    uses: ./.github/workflows/_prepare.yml
+    with:
+      builder_ref: ${{ inputs.builder_ref }}
 
-  plan:
+  # ----------------------------------------------------------------------------
+  # Build x86_64 version of Emacs
+  # ----------------------------------------------------------------------------
+
+  build_x86_64:
+    name: Build (x86_64)
+    if: inputs.x86_64
+    uses: ./.github/workflows/_build_emacs.yml
     needs: [prepare]
-    runs-on: ${{ inputs.os }}
-    outputs:
-      check: ${{ steps.check.outputs.result }}
-    steps:
-      - name: Download pre-built emacs-builder artifact
-        uses: actions/download-artifact@v2
-        with:
-          name: emacs-builder
-          path: bin
-      - name: Ensure emacs-builder is executable
-        run: chmod +x bin/emacs-builder
-      - name: Plan build
-        run: >-
-          bin/emacs-builder -l debug plan --output build-plan.yml
-          --output-dir '${{ github.workspace }}/builds'
-          ${{ needs.prepare.outputs.test_plan_args }}
-          ${{ needs.prepare.outputs.emacs_sha_override }}
-          '${{ inputs.git_ref }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Show plan
-        run: cat build-plan.yml
-      - name: Upload build-plan artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: ${{ inputs.artifact_prefix }}build-plan
-          path: build-plan.yml
-          if-no-files-found: error
-      - name: Check if planned release and asset already exist
-        id: check
-        continue-on-error: true
-        run: |
-          RESULT="$((bin/emacs-builder -l debug release --plan build-plan.yml check && echo 'ok') || echo 'fail')"
-          echo "::set-output name=result::$RESULT"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    with:
+      builder_ref: ${{ needs.prepare.outputs.builder_sha }}
+      os: "macos-13"
+      build_os: "macos-13" # Only macos-13 and earlier are x86_64.
+      artifact_prefix: "x86_64-"
+      git_ref: ${{ inputs.git_ref }}
+      git_sha: ${{ inputs.git_sha }}
+      build_args: ${{ inputs.builder_args }}
+      test_build_name: ${{ inputs.test_build_name }}
+      test_release_type: ${{ inputs.test_release_type }}
+    secrets: inherit
 
-  build:
-    runs-on: ${{ inputs.os }}
-    needs: [prepare, plan]
-    # Only run if check for existing release and asset failed.
-    if: ${{ needs.plan.outputs.check == 'fail' }}
-    steps:
-      - name: Checkout build-emacs-for-macos repo
-        uses: actions/checkout@v2
-        with:
-          repository: jimeh/build-emacs-for-macos
-          ref: ${{ needs.prepare.outputs.builder_sha }}
-          path: builder
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 2.7
-      - name: Install dependencies
-        run: make bootstrap-ci
-        working-directory: builder
-      - name: Download build-plan artifact
-        uses: actions/download-artifact@v2
-        with:
-          name: ${{ inputs.artifact_prefix }}build-plan
-          path: ./
-      - name: Build Emacs
-        run: >-
-          ./builder/build-emacs-for-macos --plan build-plan.yml
-          --no-relink-eln-files --native-full-aot
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Upload unsigned app artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: ${{ inputs.artifact_prefix }}unsigned-app
-          path: builds/*.tbz
-          if-no-files-found: error
+  release_x86_64:
+    name: Release (x86_64)
+    uses: ./.github/workflows/_release.yml
+    # Depend on both build_x86_64 and build_arm64, but only run if build_x86_64
+    # was successful and a package was created. This ensure wait for all builds
+    # to complete before running any release jobs.
+    needs: [prepare, build_x86_64, build_arm64]
+    if: |
+      always() &&
+      needs.build_x86_64.result == 'success' &&
+      needs.build_x86_64.outputs.package_created &&
+      needs.build_arm64.result != 'failure'
+    with:
+      builder_ref: ${{ needs.prepare.outputs.builder_sha }}
+      os: "macos-13" # Only macos-13 and earlier are x86_64.
+      plan_artifact: x86_64-build-plan
+      dmg_artifact: x86_64-dmg
 
-  package:
-    runs-on: ${{ inputs.os }}
-    needs: [prepare, plan, build]
-    # Only run if check for existing release and asset failed.
-    steps:
-      - name: Install dependencies
-        run: |
-          brew install python
-          $(command -v pip3 || command -v pip) install --upgrade dmgbuild
-      - name: Download pre-built emacs-builder artifact
-        uses: actions/download-artifact@v2
-        with:
-          name: emacs-builder
-          path: bin
-      - name: Ensure emacs-builder is executable
-        run: chmod +x bin/emacs-builder
-      - name: Download build-plan artifact
-        uses: actions/download-artifact@v2
-        with:
-          name: ${{ inputs.artifact_prefix }}build-plan
-          path: ./
-      - name: Download unsigned app artifact
-        uses: actions/download-artifact@v2
-        with:
-          name: ${{ inputs.artifact_prefix }}unsigned-app
-          path: builds
-      - name: Extract unsigned app archive
-        run: |
-          find * -name '*.tbz' -exec tar xvjf "{}" \;
-        working-directory: builds
-      - name: Install the Apple signing certificate
-        run: |
-          # create variables
-          CERTIFICATE_PATH="$RUNNER_TEMP/build_certificate.p12"
-          KEYCHAIN_PATH="$RUNNER_TEMP/app-signing.keychain-db"
+  # ----------------------------------------------------------------------------
+  # Build arm64 version of Emacs
+  # ----------------------------------------------------------------------------
 
-          # import certificate and provisioning profile from secrets
-          echo -n "$CERT_BASE64" | base64 --decode --output "$CERTIFICATE_PATH"
+  build_arm64:
+    name: Build (arm64)
+    if: inputs.arm64
+    uses: ./.github/workflows/_build_emacs.yml
+    needs: [prepare]
+    with:
+      builder_ref: ${{ needs.prepare.outputs.builder_sha }}
+      os: "macos-14"
+      build_os: "macos-14" # Only macos-14 and later are ARM64.
+      artifact_prefix: "arm64-"
+      git_ref: ${{ inputs.git_ref }}
+      git_sha: ${{ inputs.git_sha }}
+      build_args: ${{ inputs.builder_args }}
+      test_build_name: ${{ inputs.test_build_name }}
+      test_release_type: ${{ inputs.test_release_type }}
+    secrets: inherit
 
-          # create temporary keychain
-          security create-keychain -p "$KEYCHAIN_PASSWORD" "$KEYCHAIN_PATH"
-          security set-keychain-settings -lut 21600 "$KEYCHAIN_PATH"
-          security unlock-keychain -p "$KEYCHAIN_PASSWORD" "$KEYCHAIN_PATH"
+  release_arm64:
+    name: Release (arm64)
+    uses: ./.github/workflows/_release.yml
+    # Depend on both build_arm64 and build_x86_64, but only run if build_arm64
+    # was successful and a package was created. This ensure wait for all builds
+    # to complete before running any release jobs.
+    needs: [prepare, build_arm64, build_x86_64]
+    if: |
+      always() &&
+      needs.build_arm64.result == 'success' &&
+      needs.build_arm64.outputs.package_created &&
+      needs.build_x86_64.result != 'failure'
+    with:
+      builder_ref: ${{ needs.prepare.outputs.builder_sha }}
+      os: "macos-14" # Only macos-14 and later are ARM64.
+      plan_artifact: arm64-build-plan
+      dmg_artifact: arm64-dmg
 
-          # import certificate to keychain
-          security import "$CERTIFICATE_PATH" -P "$CERT_PASSWORD" -A \
-            -t cert -f pkcs12 -k "$KEYCHAIN_PATH"
-          security list-keychain -d user -s "$KEYCHAIN_PATH"
-        env:
-          CERT_BASE64: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_P12_BASE64 }}
-          CERT_PASSWORD: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_PASSWORD }}
-          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
-      - name: Sign, package and notarize build
-        run: >-
-          bin/emacs-builder -l debug package -v --plan build-plan.yml
-          --sign --remove-source-dir
-        env:
-          AC_USERNAME: ${{ secrets.AC_USERNAME }}
-          AC_PASSWORD: ${{ secrets.AC_PASSWORD }}
-          AC_PROVIDER: ${{ secrets.AC_PROVIDER }}
-          AC_SIGN_IDENTITY: ${{ secrets.AC_SIGN_IDENTITY }}
-      - name: Upload disk image artifacts
-        uses: actions/upload-artifact@v2
-        with:
-          name: dmg
-          path: |
-            builds/*.dmg
-            builds/*.sha*
-          if-no-files-found: error
-      - name: Clean up keychain used for signing certificate
-        if: ${{ always() }}
-        run: |
-          security delete-keychain "$RUNNER_TEMP/app-signing.keychain-db"
+  # ----------------------------------------------------------------------------
+  # Trigger update casks workflow in homebrew tap
+  # ----------------------------------------------------------------------------
+
+  update_casks:
+    name: Update Casks
+    uses: ./.github/workflows/_update-casks.yml
+    # Depend on both release jobs, but only run if either of them was
+    # successful. This ensures we only run this job once all release jobs have
+    # been completed.
+    needs: [release_x86_64, release_arm64]
+    if: >-
+      always() &&
+      inputs.test_build_name == '' &&
+      contains(needs.*.result, 'success') &&
+      !contains(needs.*.result, 'failure')
+    secrets: inherit

.github/workflows/_build_emacs.yml

@@ -0,0 +1,240 @@
+---
+# Requires _prepare.yml re-usable workflow to have run.
+name: _build_emacs
+on:
+  workflow_call:
+    inputs:
+      builder_ref:
+        description: Git ref of build-emacs-for-macos to use
+        type: string
+        required: true
+      os:
+        description: GitHub Actions runner OS
+        type: string
+        required: false
+        default: "macos-13"
+      build_os:
+        description: Target OS to build for
+        type: string
+        required: false
+        default: "macos-13"
+      artifact_prefix:
+        description: Artifact prefix for build_os
+        type: string
+        required: false
+      git_ref:
+        description: Git ref to build
+        type: string
+        required: true
+      git_sha:
+        description: Override git SHA to build
+        type: string
+        required: false
+      build_args:
+        description: Custom arguments passed to build script
+        type: string
+        required: false
+      test_build_name:
+        description: "Test build name"
+        type: string
+        required: false
+      test_release_type:
+        description: "prerelease or draft"
+        type: string
+        required: false
+        default: "prerelease"
+    outputs:
+      package_created:
+        description: "Whether or not a package was created"
+        value: ${{ jobs.package.result == 'success' }}
+
+jobs:
+  plan:
+    runs-on: ${{ inputs.build_os }}
+    outputs:
+      check: ${{ steps.check.outputs.result }}
+    steps:
+      - name: Checkout build-emacs-for-macos repo
+        uses: actions/checkout@v4
+        with:
+          repository: jimeh/build-emacs-for-macos
+          ref: ${{ inputs.builder_ref }}
+      - name: Download pre-built emacs-builder artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: emacs-builder-${{ runner.arch }}
+          path: bin
+      - name: Ensure emacs-builder is executable
+        run: chmod +x bin/emacs-builder
+      - uses: nixbuild/nix-quick-install-action@v29
+      - uses: nix-community/cache-nix-action@v5
+        with:
+          primary-key: nix-${{ runner.arch }}-${{ hashFiles('**/flake.*') }}
+      - name: Install dependencies
+        run: nix develop --command nix flake metadata
+      - name: Prepare plan test args
+        id: test_plan_args
+        if: inputs.test_build_name != ''
+        run: >-
+          echo "args=--test-build '${{ inputs.test_build_name }}' --test-release-type '${{ inputs.test_release_type }}'" >> "$GITHUB_OUTPUT"
+      - name: Set git SHA override
+        id: emacs_sha
+        if: inputs.git_sha != ''
+        run: >-
+          echo "sha=--sha '${{ inputs.git_sha }}'" >> "$GITHUB_OUTPUT"
+      - name: Plan build
+        run: >-
+          nix develop --command
+          bin/emacs-builder -l debug plan --output build-plan.yml
+          --output-dir '${{ github.workspace }}/builds'
+          ${{ steps.test_plan_args.outputs.args }}
+          ${{ steps.emacs_sha.outputs.sha }}
+          '${{ inputs.git_ref }}'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Show plan
+        run: cat build-plan.yml
+      - name: Upload build-plan artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ inputs.artifact_prefix }}build-plan
+          path: build-plan.yml
+          if-no-files-found: error
+      - name: Check if planned release and asset already exist
+        id: check
+        continue-on-error: true
+        run: |
+          echo "result=$((bin/emacs-builder -l debug release --plan build-plan.yml check && echo 'ok') || echo 'fail')" >> "$GITHUB_OUTPUT"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - run: echo 'Planned release already seems to exist.'
+        if: steps.check.outputs.result == 'ok'
+
+  build:
+    runs-on: ${{ inputs.build_os }}
+    needs: [plan]
+    # Only run if check for existing release and asset failed.
+    if: needs.plan.outputs.check == 'fail'
+    steps:
+      - name: Checkout build-emacs-for-macos repo
+        uses: actions/checkout@v4
+        with:
+          repository: jimeh/build-emacs-for-macos
+          ref: ${{ inputs.builder_ref }}
+          path: builder
+      - uses: nixbuild/nix-quick-install-action@v29
+      - uses: nix-community/cache-nix-action@v5
+        with:
+          primary-key: nix-${{ runner.arch }}-${{ hashFiles('**/flake.*') }}
+      - name: Download build-plan artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ inputs.artifact_prefix }}build-plan
+          path: ./builder/
+      - name: Install dependencies
+        run: nix develop --command nix flake metadata
+        working-directory: builder
+      - name: Install Ruby dependencies
+        run: >-
+          nix develop --command make bootstrap-ruby
+        working-directory: builder
+        env:
+          BUNDLE_WITHOUT: "development"
+      - name: Build Emacs
+        run: >-
+          nix develop
+          --command ./build-emacs-for-macos
+          --log-level debug
+          --plan build-plan.yml
+          --native-full-aot
+          --no-self-sign
+          ${{ inputs.build_args }}
+        working-directory: builder
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Upload unsigned app artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ inputs.artifact_prefix }}unsigned-app
+          path: builds/*.tbz
+          if-no-files-found: error
+      - name: Upload Emacs source artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ inputs.artifact_prefix }}emacs-source
+          path: builder/tarballs/*.tgz
+
+  package:
+    runs-on: ${{ inputs.os }}
+    needs: [plan, build]
+    steps:
+      - name: Download pre-built emacs-builder artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: emacs-builder-${{ runner.arch }}
+          path: bin
+      - name: Ensure emacs-builder is executable
+        run: chmod +x bin/emacs-builder
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+      - name: Install dmgbuild
+        run: |
+          $(command -v pip3 || command -v pip) install --upgrade dmgbuild
+      - name: Download build-plan artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ inputs.artifact_prefix }}build-plan
+          path: ./
+      - name: Download unsigned app artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ inputs.artifact_prefix }}unsigned-app
+          path: builds
+      - name: Extract unsigned app archive
+        run: |
+          find * -name '*.tbz' -exec tar xvjf "{}" \;
+        working-directory: builds
+      - name: Install the Apple signing certificate
+        run: |
+          # create variables
+          CERTIFICATE_PATH="$RUNNER_TEMP/build_certificate.p12"
+          KEYCHAIN_PATH="$RUNNER_TEMP/app-signing.keychain-db"
+
+          # import certificate and provisioning profile from secrets
+          echo -n "$CERT_BASE64" | base64 --decode > "$CERTIFICATE_PATH"
+
+          # create temporary keychain
+          security create-keychain -p "$KEYCHAIN_PASSWORD" "$KEYCHAIN_PATH"
+          security set-keychain-settings -lut 21600 "$KEYCHAIN_PATH"
+          security unlock-keychain -p "$KEYCHAIN_PASSWORD" "$KEYCHAIN_PATH"
+
+          # import certificate to keychain
+          security import "$CERTIFICATE_PATH" -P "$CERT_PASSWORD" -A \
+            -t cert -f pkcs12 -k "$KEYCHAIN_PATH"
+          security list-keychain -d user -s "$KEYCHAIN_PATH"
+        env:
+          CERT_BASE64: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_P12_BASE64 }}
+          CERT_PASSWORD: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_PASSWORD }}
+          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
+      - name: Sign, package and notarize build
+        run: >-
+          bin/emacs-builder package -v --plan build-plan.yml
+          --sign --remove-source-dir
+        env:
+          AC_USERNAME: ${{ secrets.AC_USERNAME }}
+          AC_PASSWORD: ${{ secrets.AC_PASSWORD }}
+          AC_PROVIDER: ${{ secrets.AC_PROVIDER }}
+          AC_SIGN_IDENTITY: ${{ secrets.AC_SIGN_IDENTITY }}
+      - name: Upload disk image artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ inputs.artifact_prefix }}dmg
+          path: |
+            builds/*.dmg
+            builds/*.sha*
+          if-no-files-found: error
+      - name: Clean up keychain used for signing certificate
+        if: always()
+        run: |
+          security delete-keychain "$RUNNER_TEMP/app-signing.keychain-db"

.github/workflows/_prepare.yml

@@ -5,49 +5,87 @@ on:
     inputs:
       builder_ref:
         description: Git ref to checkout of build-emacs-for-macos
-        required: true
+        required: false
         type: string
-    secrets:
-      TAP_REPO_TOKEN:
-        description: Personal Access Token for Homebrew Tap repo
-        required: true
+        default: ""
+    outputs:
+      builder_ref:
+        description: Git ref of build-emacs-for-macos at builder_ref
+        value: ${{ jobs.builder-sha.outputs.ref }}
+      builder_sha:
+        description: Git commit SHA of build-emacs-for-macos at builder_ref
+        value: ${{ jobs.builder-sha.outputs.sha }}
 
 jobs:
-  emacs-builder:
-    # Use oldest version of macOS to ensure emacs-bulder binary is compatible
-    # with later versions of macOS.
-    runs-on: macos-10.15
+  builder-sha:
+    runs-on: "macos-13"
+    outputs:
+      ref: ${{ steps.ref.outputs.ref }}
+      sha: ${{ steps.sha.outputs.sha }}
     steps:
+      - name: Default git ref check
+        id: ref
+        run: |
+          DEFAULT_BUILDER_REF="v0.6.57"
+          BUILDER_REF="${{ inputs.builder_ref }}"
+          echo "ref=${BUILDER_REF:-$DEFAULT_BUILDER_REF}" >> "$GITHUB_OUTPUT"
       - name: Checkout build-emacs-for-macos repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           repository: jimeh/build-emacs-for-macos
-          ref: ${{ inputs.builder_ref }}
-          path: builder
+          ref: ${{ steps.ref.outputs.ref }}
       - name: Store builder Git SHA
+        id: sha
         run: |
-          git rev-parse HEAD > emacs-builder-git-sha.txt
-        working-directory: builder
+          BUILDER_SHA="$(git rev-parse HEAD)"
+          echo "$BUILDER_SHA" > build-emacs-for-macos-git-sha.txt
+          echo "sha=$BUILDER_SHA" >> "$GITHUB_OUTPUT"
+          echo "Builder ref ${{ inputs.builder_ref }} resolved to" \
+               "commit SHA: $BUILDER_SHA"
       - name: Upload builder git SHA artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
-          name: emacs-builder-git-sha
-          path: builder/emacs-builder-git-sha.txt
+          name: build-emacs-for-macos-git-sha
+          path: build-emacs-for-macos-git-sha.txt
           if-no-files-found: error
-      - uses: actions/setup-go@v2
+
+  emacs-builder:
+    needs: [builder-sha]
+    strategy:
+      matrix:
+        os:
+          - macos-13 # Only macos-13 and earlier are x86_64.
+          - macos-14 # Only macos-14 and later are ARM64.
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Cache emacs-builder (${{ runner.arch }})
+        id: cache
+        uses: actions/cache@v4
         with:
-          go-version: 1.16
-      - uses: actions/cache@v2
+          path: bin/emacs-builder
+          key: emacs-builder-${{ runner.arch }}-${{ needs.builder-sha.outputs.sha }}-bin
+      - name: Checkout build-emacs-for-macos repo
+        if: steps.cache.outputs.cache-hit != 'true'
+        uses: actions/checkout@v4
         with:
-          path: ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('builder/**/go.sum') }}
-          restore-keys: ${{ runner.os }}-go-
+          repository: jimeh/build-emacs-for-macos
+          ref: ${{ needs.builder-sha.outputs.ref }}
+          fetch-depth: 0
+      - name: Setup Go
+        if: steps.cache.outputs.cache-hit != 'true'
+        uses: actions/setup-go@v5
+        with:
+          go-version: "1.23"
       - name: Build emacs-builder tool
+        if: steps.cache.outputs.cache-hit != 'true'
         run: make build
-        working-directory: builder
+      - name: Ensure emacs-builder is executable
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: chmod +x bin/emacs-builder
+      - run: bin/emacs-builder --version
       - name: Upload emacs-builder artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
-          name: emacs-builder
-          path: builder/bin/emacs-builder
+          name: emacs-builder-${{ runner.arch }}
+          path: bin/emacs-builder
           if-no-files-found: error

.github/workflows/_release.yml

@@ -1,9 +1,21 @@
 ---
 # Requires _prepare.yml and _build.yml re-usable workflows to have run.
 name: _release
+concurrency:
+  group: _release
+  cancel-in-progress: false
 on:
   workflow_call:
     inputs:
+      builder_ref:
+        description: Git ref of build-emacs-for-macos to use
+        type: string
+        required: true
+      os:
+        description: GitHub Actions runner OS
+        type: string
+        required: false
+        default: "macos-13"
       plan_artifact:
         description: Name of artifact containing a emacs-builder plan yaml file
         type: string
@@ -12,41 +24,36 @@ on:
         description: Name of artifact containing a *.dmg files to release
         type: string
         required: true
-    secrets:
-      TAP_REPO_TOKEN:
-        description: Personal Access Token for Homebrew Tap repo
-        required: true
 
 jobs:
   github:
-    runs-on: macos-11
+    runs-on: ${{ inputs.os }}
     steps:
       - name: Download pre-built emacs-builder artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
-          name: emacs-builder
+          name: emacs-builder-${{ runner.arch }}
           path: bin
       - name: Ensure emacs-builder is executable
         run: chmod +x bin/emacs-builder
       - name: Download build-plan.yml artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: ${{ inputs.plan_artifact }}
           path: ./
       - name: Download disk image artifacts
-        uses: actions/download-artifact@v2
+        id: dmg
+        continue-on-error: true
+        uses: actions/download-artifact@v4
         with:
           name: ${{ inputs.dmg_artifact }}
           path: builds
       - name: Publish disk images to a GitHub Release
+        if: steps.dmg.outputs.result != 'fail'
         run: >-
           bin/emacs-builder -l debug release --plan build-plan.yml publish
           $(find builds -name '*.dmg' -or -name '*.sha256')
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Trigger update casks workflow in homebrew tap
-        if: ${{ inputs.testBuildName == '' }}
-        run: >-
-          gh workflow run --repo jimeh/homebrew-emacs-builds update-casks.yml
-        env:
-          GITHUB_TOKEN: ${{ secrets.TAP_REPO_TOKEN }}
+      - run: echo 'No DMG artifact available, was there a new commit to build?'
+        if: steps.dmg.outputs.result == 'fail'

.github/workflows/_update-casks.yml

@@ -0,0 +1,23 @@
+---
+name: _update-casks
+concurrency:
+  group: _update-casks
+  cancel-in-progress: false
+on:
+  workflow_call:
+    inputs:
+      os:
+        description: GitHub Actions runner OS
+        type: string
+        required: false
+        default: "ubuntu-latest"
+
+jobs:
+  emacs-builds:
+    runs-on: ${{ inputs.os }}
+    steps:
+      - name: Trigger update casks workflow in homebrew tap
+        run: >-
+          gh workflow run --repo jimeh/homebrew-emacs-builds update-casks.yml
+        env:
+          GITHUB_TOKEN: ${{ secrets.TAP_REPO_TOKEN }}

.github/workflows/build.yml

@@ -11,13 +11,13 @@ on:
         description: Override Emacs git commit SHA to build
         required: false
       builder_ref:
-        description: "Git ref to checkout of build-emacs-for-macos"
-        required: true
-        default: "master"
-      os:
-        description: 'Runner OS ("macos-10.15" or "macos-11")'
-        required: true
-        default: "macos-10.15"
+        description: "Override git ref to checkout of build-emacs-for-macos"
+        required: false
+        default: ""
+      builder_args:
+        description: Custom arguments passed to build script
+        required: false
+        default: ""
       test_build_name:
         description: "Test build name"
         required: false
@@ -26,42 +26,28 @@ on:
         description: "prerelease or draft"
         required: false
         default: ""
+      x86_64:
+        description: "Build x86_64 version of Emacs"
+        required: false
+        default: true
+        type: boolean
+      arm64:
+        description: "Build arm64 version of Emacs"
+        required: false
+        default: true
+        type: boolean
 
 jobs:
-  prepare:
-    name: Prepare
-    uses: jimeh/emacs-builds/.github/workflows/_prepare.yml@main
-    with:
-      builder_ref: ${{ github.event.inputs.builder_ref }}
-    secrets:
-      TAP_REPO_TOKEN: ${{ secrets.TAP_REPO_TOKEN }}
-
   build:
     name: Build
-    needs: [prepare]
-    uses: jimeh/emacs-builds/.github/workflows/_build.yml@main
+    uses: ./.github/workflows/_build.yml
     with:
-      os: macos-10.15
-      git_ref: ${{ github.event.inputs.git_ref }}
-      git_sha: ${{ github.event.inputs.git_sha }}
-      test_build_name: ${{ github.event.inputs.test_build_name }}
-      test_release_type: ${{ github.event.inputs.test_release_type }}
-    secrets:
-      APPLE_DEVELOPER_CERTIFICATE_P12_BASE64: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_P12_BASE64 }}
-      APPLE_DEVELOPER_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_PASSWORD }}
-      KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
-      AC_USERNAME: ${{ secrets.AC_USERNAME }}
-      AC_PASSWORD: ${{ secrets.AC_PASSWORD }}
-      AC_PROVIDER: ${{ secrets.AC_PROVIDER }}
-      AC_SIGN_IDENTITY: ${{ secrets.AC_SIGN_IDENTITY }}
-      TAP_REPO_TOKEN: ${{ secrets.TAP_REPO_TOKEN }}
-
-  release:
-    name: Release
-    needs: [build]
-    uses: jimeh/emacs-builds/.github/workflows/_release.yml@main
-    with:
-      plan_artifact: build-plan
-      dmg_artifact: dmg
-    secrets:
-      TAP_REPO_TOKEN: ${{ secrets.TAP_REPO_TOKEN }}
+      git_ref: ${{ inputs.git_ref }}
+      git_sha: ${{ inputs.git_sha }}
+      builder_ref: ${{ inputs.builder_ref }}
+      builder_args: ${{ inputs.builder_args }}
+      test_build_name: ${{ inputs.test_build_name }}
+      test_release_type: ${{ inputs.test_release_type }}
+      x86_64: ${{ inputs.x86_64 }}
+      arm64: ${{ inputs.arm64 }}
+    secrets: inherit

.github/workflows/nightly-emacs-28.yml

@@ -1,47 +0,0 @@
----
-name: Nightly (emacs-28)
-on:
-  schedule:
-    - cron: "0 0 * * *"
-  workflow_dispatch:
-    inputs:
-      git_sha:
-        description: Override Emacs git commit SHA to build
-        required: false
-
-jobs:
-  prepare:
-    name: Prepare
-    uses: jimeh/emacs-builds/.github/workflows/_prepare.yml@main
-    with:
-      builder_ref: v0.6.17
-    secrets:
-      TAP_REPO_TOKEN: ${{ secrets.TAP_REPO_TOKEN }}
-
-  build:
-    name: Build
-    needs: [prepare]
-    uses: jimeh/emacs-builds/.github/workflows/_build.yml@main
-    with:
-      os: macos-10.15
-      git_ref: emacs-28
-      git_sha: ${{ github.event.inputs.git_sha }}
-    secrets:
-      APPLE_DEVELOPER_CERTIFICATE_P12_BASE64: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_P12_BASE64 }}
-      APPLE_DEVELOPER_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_PASSWORD }}
-      KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
-      AC_USERNAME: ${{ secrets.AC_USERNAME }}
-      AC_PASSWORD: ${{ secrets.AC_PASSWORD }}
-      AC_PROVIDER: ${{ secrets.AC_PROVIDER }}
-      AC_SIGN_IDENTITY: ${{ secrets.AC_SIGN_IDENTITY }}
-      TAP_REPO_TOKEN: ${{ secrets.TAP_REPO_TOKEN }}
-
-  release:
-    name: Release
-    needs: [build]
-    uses: jimeh/emacs-builds/.github/workflows/_release.yml@main
-    with:
-      plan_artifact: build-plan
-      dmg_artifact: dmg
-    secrets:
-      TAP_REPO_TOKEN: ${{ secrets.TAP_REPO_TOKEN }}

.github/workflows/nightly-master.yml

@@ -2,7 +2,7 @@
 name: Nightly (master)
 on:
   schedule:
-    - cron: "0 0 * * *"
+    - cron: "0 23 * * *"
   workflow_dispatch:
     inputs:
       git_sha:
@@ -10,38 +10,10 @@ on:
         required: false
 
 jobs:
-  prepare:
-    name: Prepare
-    uses: jimeh/emacs-builds/.github/workflows/_prepare.yml@main
-    with:
-      builder_ref: v0.6.17
-    secrets:
-      TAP_REPO_TOKEN: ${{ secrets.TAP_REPO_TOKEN }}
-
   build:
     name: Build
-    needs: [prepare]
-    uses: jimeh/emacs-builds/.github/workflows/_build.yml@main
+    uses: ./.github/workflows/_build.yml
     with:
-      os: macos-10.15
-      git_ref: master
-      git_sha: ${{ github.event.inputs.git_sha }}
-    secrets:
-      APPLE_DEVELOPER_CERTIFICATE_P12_BASE64: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_P12_BASE64 }}
-      APPLE_DEVELOPER_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_PASSWORD }}
-      KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
-      AC_USERNAME: ${{ secrets.AC_USERNAME }}
-      AC_PASSWORD: ${{ secrets.AC_PASSWORD }}
-      AC_PROVIDER: ${{ secrets.AC_PROVIDER }}
-      AC_SIGN_IDENTITY: ${{ secrets.AC_SIGN_IDENTITY }}
-      TAP_REPO_TOKEN: ${{ secrets.TAP_REPO_TOKEN }}
-
-  release:
-    name: Release
-    needs: [build]
-    uses: jimeh/emacs-builds/.github/workflows/_release.yml@main
-    with:
-      plan_artifact: build-plan
-      dmg_artifact: dmg
-    secrets:
-      TAP_REPO_TOKEN: ${{ secrets.TAP_REPO_TOKEN }}
+      git_ref: "master"
+      git_sha: ${{ inputs.git_sha }}
+    secrets: inherit

.github/workflows/update-metadata.yml

@@ -0,0 +1,35 @@
+---
+name: Update Metadata
+concurrency: jimeh/emacs-builds/update-metadata
+on:
+  schedule:
+    - cron: "0 0 * * *"
+  workflow_dispatch:
+
+jobs:
+  update-metadata:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout meta branch
+        uses: actions/checkout@v4
+        with:
+          ref: meta
+      - uses: actions/setup-go@v5
+        with:
+          go-version: "1.23"
+      - name: update total downloads shield JSON
+        run: >-
+          go run . badges downloads
+          --output total-downloads/shield.json
+          --cache total-downloads/.cache.json
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+      - name: commit and push changes to meta branch
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          commit_message: "chore(meta): update metadata files"
+          commit_user_name: github-actions[bot]
+          commit_user_email: github-actions[bot]@users.noreply.github.com
+          commit_author: >-
+            github-actions[bot] <github-actions[bot]@users.noreply.github.com>
+          skip_dirty_check: false

README.md

@@ -7,47 +7,35 @@
 </h1>
 
 <p align="center">
-  <a href="https://github.com/jimeh/emacs-builds/releases/latest">
-    <img alt="GitHub release (stable)" src="https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fjimeh%2Fhomebrew-emacs-builds%2Fmeta%2FCasks%2Femacs-app%2Fshield.json">
-  </a>
-  <a href="https://github.com/jimeh/emacs-builds/releases">
-    <img alt="GitHub release (nightly)" src="https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fjimeh%2Fhomebrew-emacs-builds%2Fmeta%2FCasks%2Femacs-app-nightly%2Fshield.json">
-  </a>
-  <a href="https://github.com/jimeh/emacs-builds/issues/7">
-    <img alt="GitHub release (known good nightly)" src="https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fjimeh%2Fhomebrew-emacs-builds%2Fmeta%2FCasks%2Femacs-app-good%2Fshield.json">
-  </a>
-  <br />
-  <a href="https://github.com/jimeh/emacs-builds/issues">
-    <img alt="GitHub issues" src="https://img.shields.io/github/issues-raw/jimeh/emacs-builds?style=flat&logo=github&logoColor=white">
-  </a>
-  <a href="https://github.com/jimeh/emacs-builds/pulls">
-    <img alt="GitHub pull requests" src="https://img.shields.io/github/issues-pr-raw/jimeh/emacs-builds?style=flat&logo=github&logoColor=white">
-  </a>
-  <a href="https://github.com/jimeh/emacs-builds/releases">
-    <img alt="GitHub all releases" src="https://img.shields.io/github/downloads/jimeh/emacs-builds/total?style=flat&logoColor=white&logo=data%3Aimage%2Fpng%3Bbase64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAEsmlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4KPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNS41LjAiPgogPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgeG1sbnM6ZXhpZj0iaHR0cDovL25zLmFkb2JlLmNvbS9leGlmLzEuMC8iCiAgICB4bWxuczp0aWZmPSJodHRwOi8vbnMuYWRvYmUuY29tL3RpZmYvMS4wLyIKICAgIHhtbG5zOnBob3Rvc2hvcD0iaHR0cDovL25zLmFkb2JlLmNvbS9waG90b3Nob3AvMS4wLyIKICAgIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIKICAgIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIgogICAgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIKICAgZXhpZjpQaXhlbFhEaW1lbnNpb249IjE0IgogICBleGlmOlBpeGVsWURpbWVuc2lvbj0iMTQiCiAgIGV4aWY6Q29sb3JTcGFjZT0iMSIKICAgdGlmZjpJbWFnZVdpZHRoPSIxNCIKICAgdGlmZjpJbWFnZUxlbmd0aD0iMTQiCiAgIHRpZmY6UmVzb2x1dGlvblVuaXQ9IjIiCiAgIHRpZmY6WFJlc29sdXRpb249IjcyLjAiCiAgIHRpZmY6WVJlc29sdXRpb249IjcyLjAiCiAgIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiCiAgIHBob3Rvc2hvcDpJQ0NQcm9maWxlPSJzUkdCIElFQzYxOTY2LTIuMSIKICAgeG1wOk1vZGlmeURhdGU9IjIwMjEtMDUtMThUMDE6MjU6NTQrMDE6MDAiCiAgIHhtcDpNZXRhZGF0YURhdGU9IjIwMjEtMDUtMThUMDE6MjU6NTQrMDE6MDAiPgogICA8eG1wTU06SGlzdG9yeT4KICAgIDxyZGY6U2VxPgogICAgIDxyZGY6bGkKICAgICAgc3RFdnQ6YWN0aW9uPSJwcm9kdWNlZCIKICAgICAgc3RFdnQ6c29mdHdhcmVBZ2VudD0iQWZmaW5pdHkgRGVzaWduZXIgMS45LjMiCiAgICAgIHN0RXZ0OndoZW49IjIwMjEtMDUtMThUMDE6MjU6NTQrMDE6MDAiLz4KICAgIDwvcmRmOlNlcT4KICAgPC94bXBNTTpIaXN0b3J5PgogIDwvcmRmOkRlc2NyaXB0aW9uPgogPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4KPD94cGFja2V0IGVuZD0iciI%2FPnP7qIwAAAGBaUNDUHNSR0IgSUVDNjE5NjYtMi4xAAAokXWRzytEURTHP2aIGBEWFhaThtWM%2FKiJjTLSUJM0RhlsZp55M2rezOu9N2myVbaKEhu%2FFvwFbJW1UkRKdsqa2KDnPKNGMud27vnc773ndO%2B54IplFc2s7gUtZxnRcMg7G5%2Fz1j5SQwvQzEBCMfWRqakIFe3thionXgWcWpXP%2FWsNiylTgao64WFFNyzhceHIsqU7vCncpmQSi8LHwn5DLih87ejJEj85nC7xh8NGLDoKrmZhb%2FoXJ3%2BxkjE0YXk5Pi1bUH7u47zEk8rNTEvsFO%2FAJEqYEF4mGGOUIH0MyRwkQD89sqJCfu93%2FiR5yVVk1ilisESaDBZ%2BUQtSPSVRFT0lI0vR6f%2FfvprqQH%2BpuicENQ%2B2%2FdIFtRvwuW7b7%2Fu2%2FXkA7ns4y5Xz83sw%2BCr6elnz7ULTKpycl7XkFpyuQfudnjAS35Jb3KWq8HwEjXFovYT6%2BVLPfvY5vIXYinzVBWzvQLecb1r4AjtZZ9JRQIRfAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAhUlEQVQokb3QsQnDMBRF0Y9J6QGylCt7GI%2BRPdJ4BIMXyA4pM0KKk0YCYawogZAHH4Tuvw%2BhiEowY67xarBirfHu68afijjXFvesK8AQEXeMB9KU2HDU2GPDE2P%2BHEzpbkNfe04pP9K8lw7knLa0k69pPpP%2BFyzaWfL%2BqXAvEXFr9K%2F58AJFIbDLRt48DAAAAABJRU5ErkJggg%3D%3D&color=blue&label=total%20downloads">
-  </a>
+  <a href="https://github.com/jimeh/emacs-builds/releases/latest"><img alt="GitHub release (stable)" src="https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fjimeh%2Fhomebrew-emacs-builds%2Fmeta%2FCasks%2Femacs-app%2Fshield.json"></a>
+  <a href="https://github.com/jimeh/emacs-builds/releases?q=pretest&expanded=true"><img alt="GitHub release (pretest)" src="https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fjimeh%2Fhomebrew-emacs-builds%2Fmeta%2FCasks%2Femacs-app-pretest%2Fshield.json"></a>
+  <a href="https://github.com/jimeh/emacs-builds/releases?q=master&expanded=true"><img alt="GitHub release (nightly)" src="https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fjimeh%2Fhomebrew-emacs-builds%2Fmeta%2FCasks%2Femacs-app-nightly%2Fshield.json"></a>
+  <a href="https://github.com/jimeh/emacs-builds/releases?q=master&expanded=true"><img alt="GitHub release (monthly)" src="https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fjimeh%2Fhomebrew-emacs-builds%2Fmeta%2FCasks%2Femacs-app-monthly%2Fshield.json"></a>
+  <a href="https://github.com/jimeh/emacs-builds/issues/7"><img alt="GitHub release (known good nightly)" src="https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fjimeh%2Fhomebrew-emacs-builds%2Fmeta%2FCasks%2Femacs-app-good%2Fshield.json"></a>
+  <a href="https://github.com/jimeh/emacs-builds/issues"><img alt="GitHub issues" src="https://img.shields.io/github/issues-raw/jimeh/emacs-builds?style=flat&logo=github&logoColor=white"></a>
+  <a href="https://github.com/jimeh/emacs-builds/pulls"><img alt="GitHub pull requests" src="https://img.shields.io/github/issues-pr-raw/jimeh/emacs-builds?style=flat&logo=github&logoColor=white"></a>
+  <a href="https://github.com/jimeh/emacs-builds/releases"><img alt="GitHub all releases" src="https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fjimeh%2Femacs-builds%2Fmeta%2Ftotal-downloads%2Fshield.json"></a>
 </p>
 
 <p align="center">
   <strong>
-    Self-contained Emacs.app builds for macOS, with native-compilation support
-    in nightly builds.
+    Self-contained Emacs.app builds for macOS, with native-compilation support.
   </strong>
 </p>
 
 ## Features
 
 - Self-contained Emacs.app application bundle, with no external dependencies.
-- Native-compilation ([gccemacs][]), nightly builds only.
-- Native JSON parsing via libjansson.
+- Native compilation ([gccemacs][]).
+- Native JSON parsing.
 - SVG rendering via librsvg.
 - Various image formats are supported via macOS native image APIs.
-- Xwidget-webkit support is enabled, allowing access to a embedded WebKit-based
-  browser with `M-x xwidget-webkit-browse-url`.
+- Xwidget-webkit support, allowing access to a embedded WebKit-based browser
+  with `M-x xwidget-webkit-browse-url`.
 - Native XML parsing via libxml2.
 - Dynamic module loading.
-- Includes the [fix-window-role][] and [system-appearance][] patches from the
-  excellent [emacs-plus][] project.
+- Includes the [fix-window-role][], [system-appearance][], and
+  [round-undecorated-frame][] patches from the excellent [emacs-plus][] project.
 - Emacs source is fetched from the [emacs-mirror/emacs][] GitHub repository.
 - Build creation is transparent and public through the use of GitHub Actions,
   allowing anyone to inspect git commit SHAs, full source code, and exact
@@ -61,26 +49,32 @@
   https://github.com/d12frosted/homebrew-emacs-plus/blob/master/patches/emacs-28/fix-window-role.patch
 [system-appearance]:
   https://github.com/d12frosted/homebrew-emacs-plus/blob/master/patches/emacs-28/system-appearance.patch
+[round-undecorated-frame]:
+  https://github.com/d12frosted/homebrew-emacs-plus/blob/master/patches/emacs-29/round-undecorated-frame.patch
 [emacs-plus]: https://github.com/d12frosted/homebrew-emacs-plus
 [emacs-mirror/emacs]: https://github.com/emacs-mirror/emacs
 
 ## System Requirements
 
-- macOS 10.15.x or later (uses Rosetta2 on M1-based macs).
-- Homebrew `gcc` formula (nightly builds only).
-- Xcode Command Line Tools (nightly builds only).
+- Builds produced after 2024-11-30:
+  - macOS 11 or later.
+- Builds produced before 2024-11-30:
+  - macOS 13 Ventura or later for Apple Silicon builds.
+  - macOS 12 Monterey or later for Intel builds.
+- Xcode Command Line Tools to use native compilation in Emacs, available since
+  Emacs 28.x builds.
 
 ## Installation
 
 ### Manual Download
 
-See the [Releases][] page to download latest builds, or [here](latest) for the
+See the [Releases][] page to download latest builds, or [here][latest] for the
 latest stable release.
 
-Nightly builds of Emacs are for the part just fine, but if you don't like living
-too close to the edge, see issue [#7 Known Good Nightly Builds][7] for a list of
-recent nightly builds which have been actively used by a living being without
-any issues.
+Nightly builds of Emacs are for the most part just fine, but if you don't like
+living too close to the edge, see issue [#7 Known Good Nightly Builds][7] for a
+list of recent nightly builds which have been actively used by a living being
+for at least a day or two without any obvious issues.
 
 [releases]: https://github.com/jimeh/emacs-builds/releases
 [latest]: https://github.com/jimeh/emacs-builds/releases/latest
@@ -95,22 +89,36 @@ any issues.
    brew tap jimeh/emacs-builds
    ```
 2. Install one of the available casks:
-   - `emacs-app-nightly` for the latest nightly build:
+   - `emacs-app` — Latest stable release of Emacs.
+     ```
+     brew install --cask emacs-app
+     ```
+   - `emacs-app-pretest` — Latest pretest build of Emacs.
+     ```
+     brew install --cask emacs-app-pretest
+     ```
+   - `emacs-app-nightly` — Build of Emacs from the `master` branch, updated
+     every night.
      ```
      brew install --cask emacs-app-nightly
      ```
+   - `emacs-app-monthly` — Build of Emacs from the `master` branch, updated on
+     the 1st of each month. These includes native Apple Silicon support.
+     ```
+     brew install --cask emacs-app-monthly
+     ```
    - `emacs-app-good` for the latest known good nightly build listed on [#7][7]:
      ```
      brew install --cask emacs-app-good
      ```
-   - `emacs-app` for the latest stable release of Emacs (does not include
-     native-comp at time of writing):
-     ```
-     brew install --cask emacs-app
-     ```
 
 [7]: https://github.com/jimeh/emacs-builds/issues/7
 
+## Apple Silicon
+
+As of 2024-11-30, all builds include both Apple Silicon (arm64) and Intel
+(x86_64) artifacts.
+
 ## Use Emacs.app as `emacs` CLI Tool
 
 ### Installed via Homebrew Cask
@@ -150,19 +158,18 @@ use the alias from the above example.
 ## Build Process
 
 Building Emacs is done using the [jimeh/build-emacs-for-macos][] build script,
-executed within a GitHub Actions [workflow][]. This is why macOS 10.15.x or
-later is required, as it's the oldest version of macOS available in GitHub
-Actions.
+executed within a GitHub Actions [workflow][].
 
 [jimeh/build-emacs-for-macos]: https://github.com/jimeh/build-emacs-for-macos
 [workflow]:
-  https://github.com/jimeh/emacs-builds/blob/main/.github/workflows/build.yml
+  https://github.com/jimeh/emacs-builds/blob/main/.github/workflows/nightly-master.yml
 
 Full history for all builds is available on GitHub Actions [here][actions].
+Build logs are only retained by GitHub for 90 days though.
 
 [actions]: https://github.com/jimeh/emacs-builds/actions
 
-Nightly builds are scheduled for 0:00 UTC every night, based on the latest
+Nightly builds are scheduled for 23:00 UTC every night, based on the latest
 commit from the `master` branch of the [emacs-mirror/emacs][] repository. This
 means a nightly build will only be produced if there have been new commits since
 the last nightly build.
@@ -192,3 +199,34 @@ GitHub Actions workflow run which produced the build.
 Please see [Issues][] for details of things to come, or to report issues.
 
 [issues]: https://github.com/jimeh/emacs-builds/issues
+
+## News / Recent Changes
+
+### 2024-12-01 — Apple Silicon builds all the time, more stability via Nix
+
+GitHub's standard runner for macOS 14 and later runs on Apple Silicon, and are
+free to use for public repositories. As such we now use `runs-on: macos-13` for
+Intel builds, and `runs-on: macos-14` for Apple Silicon builds. And we do so on
+all builds, nightlies, pretests, and stable.
+
+Additionally, macOS 11 Big Sur is now the minimum required version again, for
+both Intel and Apple Silicon builds. This is due to switching from Homebrew to
+Nix for managing build-time dependencies. And it supports easily switching
+between different macOS SDK versions, meaning we can target an SDK that is older
+than the OS we are creating the builds on.
+
+### 2023-11-22 — Apple Silicon builds, drop macOS 11 support
+
+Apple Silicon builds are now available, but limited to stable releases, and
+nightly builds on the 1st of each month due to the cost of using M1-based
+runners on GitHub Actions. Apple Silicon builds also require macOS 13 Ventura,
+as that is the oldest macOS version available on M1-based runners.
+
+Additionally, Intel builds minimum required macOS version has been increased
+from macOS 11 Big Sur, to macOS 12 Monterey. This was needed as Homebrew no
+longer supports Big Sur, leading to very lengthy and error prone builds as all
+Homebrew dependencies had to be installed from source.
+
+If dropping support for macOS 11 turns out to be a big issue, it may be possible
+to offer macOS 11 compatible builds on a less frequent schedule similar to what
+we're doing with Apple Silicon.