fix: resolve dmgbuild installation issue and outdated actions

By default the build script will enable native-comp if it detects it in
the source tree. This caused recently nightly builds of master to be
built without native-comp due to recent changes in Emacs' configure
script which broke native-comp detection. More details here:

https://github.com/jimeh/build-emacs-for-macos/issues/76

Hence we explicitly enable native-comp now for the nightly master and
emacs-28 builds, which will cause the build script to fail if it cannot
detect native-comp support in the source tree.

Any failure to detect native-comp in master and emacs-28 branches would
at this point be due to a bug/issue with the build script, rather than
Emacs' source tree.

.github/workflows/_build.yml

@@ -68,25 +68,24 @@ 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@v3
         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 }}
@@ -94,7 +93,7 @@ jobs:
       check: ${{ steps.check.outputs.result }}
     steps:
       - name: Download pre-built emacs-builder artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: emacs-builder
           path: bin
@@ -112,7 +111,7 @@ jobs:
       - name: Show plan
         run: cat build-plan.yml
       - name: Upload build-plan artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ inputs.artifact_prefix }}build-plan
           path: build-plan.yml
@@ -121,8 +120,7 @@ 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.'
@@ -143,11 +141,13 @@ jobs:
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: 2.7
+      - name: Update homebrew
+        run: brew update
       - name: Install dependencies
         run: make bootstrap-ci
         working-directory: builder
       - name: Download build-plan artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: ${{ inputs.artifact_prefix }}build-plan
           path: ./
@@ -159,13 +159,13 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Upload unsigned app artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         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@v3
         with:
           name: ${{ inputs.artifact_prefix }}emacs-source
           path: builder/tarballs/*.tgz
@@ -175,24 +175,26 @@ jobs:
     needs: [prepare, plan, build]
     # Only run if check for existing release and asset failed.
     steps:
-      - name: Install dependencies
+      - uses: actions/setup-python@v4
+        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@v3
         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@v3
         with:
           name: ${{ inputs.artifact_prefix }}build-plan
           path: ./
       - name: Download unsigned app artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: ${{ inputs.artifact_prefix }}unsigned-app
           path: builds
@@ -232,7 +234,7 @@ 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@v3
         with:
           name: dmg
           path: |

.github/workflows/_prepare.yml

@@ -7,7 +7,7 @@ on:
         description: Git ref to checkout of build-emacs-for-macos
         required: false
         type: string
-        default: "v0.6.27"
+        default: "v0.6.36"
     secrets:
       TAP_REPO_TOKEN:
         description: Personal Access Token for Homebrew Tap repo
@@ -17,10 +17,10 @@ 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: macos-11
     steps:
       - name: Checkout build-emacs-for-macos repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: jimeh/build-emacs-for-macos
           ref: ${{ inputs.builder_ref }}
@@ -30,7 +30,7 @@ jobs:
           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@v3
         with:
           name: emacs-builder-git-sha
           path: builder/emacs-builder-git-sha.txt
@@ -38,7 +38,7 @@ jobs:
       - uses: actions/setup-go@v2
         with:
           go-version: 1.16
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-go-${{ hashFiles('builder/**/go.sum') }}
@@ -47,7 +47,7 @@ jobs:
         run: make build
         working-directory: builder
       - name: Upload emacs-builder artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: emacs-builder
           path: builder/bin/emacs-builder

.github/workflows/_release.yml

@@ -22,21 +22,21 @@ jobs:
     runs-on: macos-11
     steps:
       - name: Download pre-built emacs-builder artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         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@v3
         with:
           name: ${{ inputs.plan_artifact }}
           path: ./
       - name: Download disk image artifacts
         id: dmg
         continue-on-error: true
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: ${{ inputs.dmg_artifact }}
           path: builds

.github/workflows/build.yml

@@ -19,9 +19,9 @@ on:
         required: false
         default: ""
       os:
-        description: 'Runner OS ("macos-10.15" or "macos-11")'
+        description: 'Runner OS ("macos-11", "macos-12", or "macos-latest")'
         required: true
-        default: "macos-10.15"
+        default: "macos-11"
       test_build_name:
         description: "Test build name"
         required: false
@@ -45,7 +45,7 @@ jobs:
     needs: [prepare]
     uses: jimeh/emacs-builds/.github/workflows/_build.yml@main
     with:
-      os: macos-10.15
+      os: ${{ github.event.inputs.os }}
       git_ref: ${{ github.event.inputs.git_ref }}
       git_sha: ${{ github.event.inputs.git_sha }}
       build_args: ${{ github.event.inputs.builder_args }}

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

@@ -21,9 +21,10 @@ jobs:
     needs: [prepare]
     uses: jimeh/emacs-builds/.github/workflows/_build.yml@main
     with:
-      os: macos-10.15
+      os: macos-11
       git_ref: emacs-28
       git_sha: ${{ github.event.inputs.git_sha }}
+      build_args: --native-comp
     secrets:
       APPLE_DEVELOPER_CERTIFICATE_P12_BASE64: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_P12_BASE64 }}
       APPLE_DEVELOPER_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_PASSWORD }}

.github/workflows/nightly-master.yml

@@ -21,9 +21,10 @@ jobs:
     needs: [prepare]
     uses: jimeh/emacs-builds/.github/workflows/_build.yml@main
     with:
-      os: macos-10.15
+      os: macos-11
       git_ref: master
       git_sha: ${{ github.event.inputs.git_sha }}
+      build_args: --native-comp
     secrets:
       APPLE_DEVELOPER_CERTIFICATE_P12_BASE64: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_P12_BASE64 }}
       APPLE_DEVELOPER_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_PASSWORD }}

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=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>
   <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>
@@ -55,7 +54,7 @@
 
 ## System Requirements
 
-- macOS 10.15.x or later (uses Rosetta2 on Apple Silicon machines).
+- macOS 11.x (Big Sur) or later (uses Rosetta2 on Apple Silicon machines).
 - Xcode Command Line Tools for native compilation (Emacs 28.x and later).
 
 ## Installation
@@ -83,6 +82,15 @@ for a day or two without any obvious issues.
    brew tap jimeh/emacs-builds
    ```
 2. Install one of the available casks:
+   - `emacs-app` for the latest stable release of Emacs (includes native-comp
+     since v28.1):
+     ```
+     brew install --cask emacs-app
+     ```
+   - `emacs-app-pretest` for the latest pretest build from Emacs:
+     ```
+     brew install --cask emacs-app-pretest
+     ```
    - `emacs-app-nightly` for the latest nightly build from Emacs' `master`
      branch:
      ```
@@ -97,11 +105,6 @@ for a day or two without any obvious issues.
      ```
      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
 
@@ -144,8 +147,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