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

Run once a day only, and pass in cache flag to keep download totals
accurate over time.

.github/workflows/_build.yml

@@ -11,7 +11,13 @@ on:
       os:
         description: GitHub Actions runner OS
         type: string
-        required: true
+        required: false
+        default: "macos-12"
+      build_os:
+        description: Target OS to build for
+        type: string
+        required: false
+        default: "macos-12"
       git_ref:
         description: Git ref to build
         type: string
@@ -58,6 +64,10 @@ on:
       TAP_REPO_TOKEN:
         description: Homebrew Tap Token
         required: true
+    outputs:
+      package_created:
+        description: "Whether or not a package was created"
+        value: ${{ jobs.package.result == 'success' }}
 
 jobs:
   prepare:
@@ -68,37 +78,51 @@ jobs:
       test_plan_args: ${{ steps.test_plan_args.outputs.args }}
     steps:
       - name: Download emacs-builder git SHA artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         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)"
+          echo "sha=$(cat emacs-builder-git-sha.txt)" >> $GITHUB_OUTPUT
       - 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 }}'"
+          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 "::set-output name=sha::--sha '${{ inputs.git_sha }}'"
-
+          echo "sha=--sha '${{ inputs.git_sha }}'" >> $GITHUB_OUTPUT
   plan:
     needs: [prepare]
-    runs-on: ${{ inputs.os }}
+    runs-on: ${{ inputs.build_os }}
     outputs:
       check: ${{ steps.check.outputs.result }}
     steps:
+      - name: Checkout build-emacs-for-macos repo
+        if: ${{ inputs.os != inputs.build_os }}
+        uses: actions/checkout@v4
+        with:
+          repository: jimeh/build-emacs-for-macos
+          ref: ${{ needs.prepare.outputs.builder_sha }}
+      - uses: actions/setup-go@v5
+        if: ${{ inputs.os != inputs.build_os }}
+        with:
+          go-version: "1.21"
+      - name: Build emacs-builder tool
+        if: ${{ inputs.os != inputs.build_os }}
+        run: make build
       - name: Download pre-built emacs-builder artifact
-        uses: actions/download-artifact@v2
+        if: ${{ inputs.os == inputs.build_os }}
+        uses: actions/download-artifact@v4
         with:
           name: emacs-builder
           path: bin
       - name: Ensure emacs-builder is executable
+        if: ${{ inputs.os == inputs.build_os }}
         run: chmod +x bin/emacs-builder
       - name: Plan build
         run: >-
@@ -112,7 +136,7 @@ jobs:
       - name: Show plan
         run: cat build-plan.yml
       - name: Upload build-plan artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ inputs.artifact_prefix }}build-plan
           path: build-plan.yml
@@ -121,76 +145,90 @@ jobs:
         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"
+          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.os }}
+    runs-on: ${{ inputs.build_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
+        uses: actions/checkout@v4
         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
+          ruby-version: "3.2"
+      - name: Update homebrew
+        run: brew update
+      - name: Fix system python breaking homebrew
+        run: >-
+          find "$(brew --prefix)/bin" -type l
+          -ilname '*/Library/Frameworks/Python.framework/*'
+          -delete
       - name: Install dependencies
-        run: make bootstrap-ci
+        run: make bootstrap
         working-directory: builder
+        env:
+          BUNDLE_WITHOUT: "development"
       - name: Download build-plan artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         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
+          ./builder/build-emacs-for-macos
+          --log-level debug
+          --plan build-plan.yml
+          --native-full-aot
+          --no-self-sign
           ${{ inputs.build_args }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Upload unsigned app artifact
-        uses: actions/upload-artifact@v2
+        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@v2
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ inputs.artifact_prefix }}emacs-source
-          path: tarballs/*.tgz
+          path: builder/tarballs/*.tgz
 
   package:
     runs-on: ${{ inputs.os }}
     needs: [prepare, plan, build]
-    # Only run if check for existing release and asset failed.
     steps:
-      - name: Install dependencies
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+      - name: Install dmgbuild
         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
+        uses: actions/download-artifact@v4
         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
+        uses: actions/download-artifact@v4
         with:
           name: ${{ inputs.artifact_prefix }}build-plan
           path: ./
       - name: Download unsigned app artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: ${{ inputs.artifact_prefix }}unsigned-app
           path: builds
@@ -222,7 +260,7 @@ jobs:
           KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
       - name: Sign, package and notarize build
         run: >-
-          bin/emacs-builder -l debug package -v --plan build-plan.yml
+          bin/emacs-builder package -v --plan build-plan.yml
           --sign --remove-source-dir
         env:
           AC_USERNAME: ${{ secrets.AC_USERNAME }}
@@ -230,9 +268,9 @@ jobs:
           AC_PROVIDER: ${{ secrets.AC_PROVIDER }}
           AC_SIGN_IDENTITY: ${{ secrets.AC_SIGN_IDENTITY }}
       - name: Upload disk image artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
-          name: dmg
+          name: ${{ inputs.artifact_prefix }}dmg
           path: |
             builds/*.dmg
             builds/*.sha*

.github/workflows/_prepare.yml

@@ -3,11 +3,16 @@ name: _prepare
 on:
   workflow_call:
     inputs:
+      os:
+        description: GitHub Actions runner OS
+        type: string
+        required: false
+        default: "macos-12"
       builder_ref:
         description: Git ref to checkout of build-emacs-for-macos
         required: false
         type: string
-        default: "v0.6.23"
+        default: "v0.6.48"
     secrets:
       TAP_REPO_TOKEN:
         description: Personal Access Token for Homebrew Tap repo
@@ -15,40 +20,30 @@ on:
 
 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
+    runs-on: ${{ inputs.os }}
     steps:
       - 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
       - name: Store builder Git SHA
         run: |
           git rev-parse HEAD > emacs-builder-git-sha.txt
-        working-directory: builder
       - 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
+          path: emacs-builder-git-sha.txt
           if-no-files-found: error
-      - uses: actions/setup-go@v2
+      - uses: actions/setup-go@v5
         with:
-          go-version: 1.16
-      - uses: actions/cache@v2
-        with:
-          path: ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('builder/**/go.sum') }}
-          restore-keys: ${{ runner.os }}-go-
+          go-version: "1.21"
       - name: Build emacs-builder tool
         run: make build
-        working-directory: builder
       - name: Upload emacs-builder artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: emacs-builder
-          path: builder/bin/emacs-builder
+          path: bin/emacs-builder
           if-no-files-found: error

.github/workflows/_release.yml

@@ -4,6 +4,11 @@ name: _release
 on:
   workflow_call:
     inputs:
+      os:
+        description: GitHub Actions runner OS
+        type: string
+        required: false
+        default: "macos-12"
       plan_artifact:
         description: Name of artifact containing a emacs-builder plan yaml file
         type: string
@@ -12,6 +17,15 @@ on:
         description: Name of artifact containing a *.dmg files to release
         type: string
         required: true
+      test_build_name:
+        description: "Test build name"
+        type: string
+        required: false
+      update_casks:
+        description: "Update casks in homebrew tap?"
+        type: boolean
+        required: true
+        default: true
     secrets:
       TAP_REPO_TOKEN:
         description: Personal Access Token for Homebrew Tap repo
@@ -19,34 +33,42 @@ on:
 
 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
           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 == '' }}
+        if: >-
+          steps.dmg.outputs.result != 'fail' &&
+          inputs.test_build_name == '' &&
+          inputs.update_casks
         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/build.yml

@@ -13,15 +13,15 @@ on:
       builder_ref:
         description: "Git ref to checkout of build-emacs-for-macos"
         required: true
-        default: "master"
+        default: "v0.6.48"
       builder_args:
         description: Custom arguments passed to build script
         required: false
         default: ""
       os:
-        description: 'Runner OS ("macos-10.15" or "macos-11")'
+        description: 'Runner OS ("macos-12", "macos-13", or "macos-latest")'
         required: true
-        default: "macos-10.15"
+        default: "macos-12"
       test_build_name:
         description: "Test build name"
         required: false
@@ -30,22 +30,40 @@ 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: false
+        type: boolean
 
 jobs:
   prepare:
     name: Prepare
-    uses: jimeh/emacs-builds/.github/workflows/_prepare.yml@main
+    uses: ./.github/workflows/_prepare.yml
     with:
+      os: ${{ github.event.inputs.os }}
       builder_ref: ${{ github.event.inputs.builder_ref }}
     secrets:
       TAP_REPO_TOKEN: ${{ secrets.TAP_REPO_TOKEN }}
 
-  build:
-    name: Build
+  # ----------------------------------------------------------------------------
+  # Build x86_64 version of Emacs
+  # ----------------------------------------------------------------------------
+
+  build_x86_64:
+    name: Build (x86_64)
+    if: ${{ github.event.inputs.x86_64 == 'true' }}
+    uses: ./.github/workflows/_build.yml
     needs: [prepare]
-    uses: jimeh/emacs-builds/.github/workflows/_build.yml@main
     with:
-      os: macos-10.15
+      os: ${{ github.event.inputs.os }}
+      build_os: "macos-12"
+      artifact_prefix: "x86_64-"
       git_ref: ${{ github.event.inputs.git_ref }}
       git_sha: ${{ github.event.inputs.git_sha }}
       build_args: ${{ github.event.inputs.builder_args }}
@@ -61,12 +79,58 @@ jobs:
       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
+  release_x86_64:
+    name: Release (x86_64)
+    uses: ./.github/workflows/_release.yml
+    needs: [build_x86_64]
+    if: ${{ needs.build_x86_64.outputs.package_created }}
     with:
-      plan_artifact: build-plan
-      dmg_artifact: dmg
+      os: ${{ github.event.inputs.os }}
+      plan_artifact: x86_64-build-plan
+      dmg_artifact: x86_64-dmg
+      test_build_name: ${{ github.event.inputs.test_build_name }}
+      update_casks: true
+    secrets:
+      TAP_REPO_TOKEN: ${{ secrets.TAP_REPO_TOKEN }}
+
+  # ----------------------------------------------------------------------------
+  # Build arm64 version of Emacs
+  # ----------------------------------------------------------------------------
+
+  build_arm64:
+    name: Build (arm64)
+    if: ${{ github.event.inputs.arm64 == 'true' }}
+    uses: ./.github/workflows/_build.yml
+    needs: [prepare]
+    with:
+      os: ${{ github.event.inputs.os }}
+      build_os: "macos-13-xlarge" # Only macos-13-xlarge has arm64 support.
+      artifact_prefix: "arm64-"
+      git_ref: ${{ github.event.inputs.git_ref }}
+      git_sha: ${{ github.event.inputs.git_sha }}
+      build_args: ${{ github.event.inputs.builder_args }}
+      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_arm64:
+    name: Release (arm64)
+    uses: ./.github/workflows/_release.yml
+    needs: [build_arm64]
+    if: ${{ needs.build_arm64.outputs.package_created }}
+    with:
+      os: ${{ github.event.inputs.os }}
+      plan_artifact: arm64-build-plan
+      dmg_artifact: arm64-dmg
+      test_build_name: ${{ github.event.inputs.test_build_name }}
+      update_casks: false
     secrets:
       TAP_REPO_TOKEN: ${{ secrets.TAP_REPO_TOKEN }}

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

@@ -1,45 +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
-    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,27 +2,38 @@
 name: Nightly (master)
 on:
   schedule:
-    - cron: "0 0 * * *"
+    - cron: "0 23 1 * *"
+    - cron: "0 23 2-31 * *"
   workflow_dispatch:
     inputs:
       git_sha:
         description: Override Emacs git commit SHA to build
         required: false
+      arm64:
+        description: "Build arm64 version of Emacs?"
+        required: false
+        default: false
+        type: boolean
 
 jobs:
   prepare:
     name: Prepare
-    uses: jimeh/emacs-builds/.github/workflows/_prepare.yml@main
+    uses: ./.github/workflows/_prepare.yml
     secrets:
       TAP_REPO_TOKEN: ${{ secrets.TAP_REPO_TOKEN }}
 
-  build:
-    name: Build
+  # ----------------------------------------------------------------------------
+  # Build x86_64 version of Emacs
+  # ----------------------------------------------------------------------------
+
+  build_x86_64:
+    name: Build (x86_64)
+    uses: ./.github/workflows/_build.yml
     needs: [prepare]
-    uses: jimeh/emacs-builds/.github/workflows/_build.yml@main
     with:
-      os: macos-10.15
-      git_ref: master
+      build_os: "macos-12"
+      artifact_prefix: "x86_64-"
+      git_ref: "master"
       git_sha: ${{ github.event.inputs.git_sha }}
     secrets:
       APPLE_DEVELOPER_CERTIFICATE_P12_BASE64: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_P12_BASE64 }}
@@ -34,12 +45,52 @@ jobs:
       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
+  release_x86_64:
+    name: Release (x86_64)
+    uses: ./.github/workflows/_release.yml
+    needs: [build_x86_64]
+    if: ${{ needs.build_x86_64.outputs.package_created }}
     with:
-      plan_artifact: build-plan
-      dmg_artifact: dmg
+      plan_artifact: x86_64-build-plan
+      dmg_artifact: x86_64-dmg
+      update_casks: true
+    secrets:
+      TAP_REPO_TOKEN: ${{ secrets.TAP_REPO_TOKEN }}
+
+  # ----------------------------------------------------------------------------
+  # Build arm64 version of Emacs
+  # ----------------------------------------------------------------------------
+
+  build_arm64:
+    name: Build (arm64)
+    if: >-
+      github.event.inputs.arm64 == 'true' ||
+      github.event.schedule == '0 23 1 * *'
+    uses: ./.github/workflows/_build.yml
+    needs: [prepare]
+    with:
+      build_os: "macos-13-xlarge" # Only macos-13-xlarge has arm64 support.
+      artifact_prefix: "arm64-"
+      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_arm64:
+    name: Release (arm64)
+    uses: ./.github/workflows/_release.yml
+    needs: [build_arm64]
+    if: ${{ needs.build_arm64.outputs.package_created }}
+    with:
+      plan_artifact: arm64-build-plan
+      dmg_artifact: arm64-dmg
+      update_casks: false
     secrets:
       TAP_REPO_TOKEN: ${{ secrets.TAP_REPO_TOKEN }}

.github/workflows/update-metadata.yml

@@ -3,27 +3,27 @@ name: Update Metadata
 concurrency: jimeh/emacs-builds/update-metadata
 on:
   schedule:
-    - cron: "0 0,12 * * *"
+    - cron: "0 0 * * *"
   workflow_dispatch:
 
 jobs:
   update-metadata:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout tap repository main branch
-        uses: actions/checkout@v2
+      - name: Checkout meta branch
+        uses: actions/checkout@v3
         with:
           ref: meta
-      - uses: actions/setup-go@v2
+      - uses: actions/setup-go@v5
         with:
-          go-version: 1.17
-      - uses: actions/cache@v2
-        with:
-          path: ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('builder/**/go.sum') }}
-          restore-keys: ${{ runner.os }}-go-
+          go-version: "1.21"
       - name: update total downloads shield JSON
-        run: go run . badges downloads -o 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@v4
         with:

README.md

@@ -8,11 +8,10 @@
 
 <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?q=emacs-28&expanded=true"><img alt="GitHub release (nightly@emacs-28)" src="https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fjimeh%2Fhomebrew-emacs-builds%2Fmeta%2FCasks%2Femacs-app-nightly-28%2Fshield.json"></a>
-  <br />
+  <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>
-  <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/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fjimeh%2Femacs-builds%2Fmeta%2Ftotal-downloads%2Fshield.json"></a>
@@ -20,15 +19,14 @@
 
 <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 compilation ([gccemacs][]), only in Emacs 28.x and later builds.
 - Native JSON parsing via libjansson.
 - SVG rendering via librsvg.
 - Various image formats are supported via macOS native image APIs.
@@ -36,8 +34,8 @@
   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
@@ -51,26 +49,30 @@
   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).
+- macOS 13 Ventura or later for Apple Silicon builds.
+- macOS 12 Monterey or later for Intel builds, which can run on Apple Silicon
+  via Rosetta2.
+- Xcode Command Line Tools to use native compilation in Emacs, available since
+  28.x.
 
 ## 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
@@ -85,28 +87,53 @@ any issues.
    brew tap jimeh/emacs-builds
    ```
 2. Install one of the available casks:
-   - `emacs-app-nightly` for the latest nightly build from Emacs' `master`
-     branch:
+   - `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-nightly-28` for the latest Emacs 28.x nightly build from the
-     `emacs-28` branch:
-     ```
-     brew install --cask emacs-app-nightly-28
-     ```
-   - `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
+
+Native builds for Apple Silicon is supported, but currently GitHub's M1-based
+Actions Runners are prohibitively expensive for nightly builds. Intel builds
+though do work on Apple Silicon machines via Rosetta2, with a minor performance
+impact.
+
+Due to the costs, Apple Silicon builds are for now only scheduled for the 1st of
+each month. The `emacs-app-monthly` Homebrew Cask will always be pointing at a
+release that includes Intel and Apple Silicon builds.
+
+Builds for stable releases of Emacs will also include both Intel and Apple
+Silicon builds.
+
+### Costs
+
+At time of writing (2023-11-21), an average Apple Silicon build uses around 17
+minutes of billable time, at a cost of $0.16 USD per minute, that comes out to
+around $2.72 per build. I am considering enabling sponsorship on this repository
+in an effort to cover the costs for more frequent Apple Silicon builds, and will
+update here if/when I have any news.
+
 ## Use Emacs.app as `emacs` CLI Tool
 
 ### Installed via Homebrew Cask
@@ -146,8 +173,8 @@ 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
+executed within a GitHub Actions [workflow][]. This is why macOS 11.x (Big Sur)
+or later is required, as it's the oldest version of macOS available in GitHub
 Actions.
 
 [jimeh/build-emacs-for-macos]: https://github.com/jimeh/build-emacs-for-macos
@@ -155,10 +182,11 @@ Actions.
   https://github.com/jimeh/emacs-builds/blob/main/.github/workflows/build.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.
@@ -188,3 +216,21 @@ 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
+
+### 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.