From c1c4a03471171a77efcf667ec588f567fa2b5016 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Sat, 8 Oct 2022 14:46:14 +0100 Subject: [PATCH] fix(nightly): prevent nightly builds without native-comp 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/nightly-emacs-28.yml | 1 + .github/workflows/nightly-master.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/nightly-emacs-28.yml b/.github/workflows/nightly-emacs-28.yml index e8d7228..c19c8ee 100644 --- a/.github/workflows/nightly-emacs-28.yml +++ b/.github/workflows/nightly-emacs-28.yml @@ -24,6 +24,7 @@ jobs: 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 }} diff --git a/.github/workflows/nightly-master.yml b/.github/workflows/nightly-master.yml index 6a05c07..05d42a1 100644 --- a/.github/workflows/nightly-master.yml +++ b/.github/workflows/nightly-master.yml @@ -24,6 +24,7 @@ jobs: 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 }}