From 7e4ba5a9b8e6f4254089cedd66b875d338d5244c Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Fri, 12 Nov 2021 13:26:24 +0000 Subject: [PATCH] fix(builds): only use posix-spawn patch on emacs-28 builds The posix-spawn patch has been added to the master branch, but not the emacs-28 branch yet. --- .github/workflows/_build.yml | 2 +- .github/workflows/nightly-emacs-28.yml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/_build.yml b/.github/workflows/_build.yml index 0f421d3..cc29d3b 100644 --- a/.github/workflows/_build.yml +++ b/.github/workflows/_build.yml @@ -152,7 +152,7 @@ jobs: - name: Build Emacs run: >- ./builder/build-emacs-for-macos --plan build-plan.yml - --no-relink-eln-files --native-full-aot --posix-spawn + --no-relink-eln-files --native-full-aot ${{ inputs.build_args }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/nightly-emacs-28.yml b/.github/workflows/nightly-emacs-28.yml index dadeb41..d34c38f 100644 --- a/.github/workflows/nightly-emacs-28.yml +++ b/.github/workflows/nightly-emacs-28.yml @@ -24,6 +24,8 @@ jobs: os: macos-10.15 git_ref: emacs-28 git_sha: ${{ github.event.inputs.git_sha }} + build_args: >- + --posix-spawn secrets: APPLE_DEVELOPER_CERTIFICATE_P12_BASE64: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_P12_BASE64 }} APPLE_DEVELOPER_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_PASSWORD }}