fix(build): add missing --no-archive flag to build script

fix(test-build): build plan is needed by package job
chore(deps): update build-emacs-for-macos to 0.6.15
2026-02-19 07:16:40 +00:00 · 2021-08-05 10:36:18 +01:00 · 2021-08-05 10:35:55 +01:00 · 2021-08-05 02:39:18 +01:00 · 2021-08-05 01:22:09 +01:00 · 2021-08-05 01:21:02 +01:00
2 changed files with 47 additions and 22 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -40,7 +40,7 @@ jobs:
        uses: actions/checkout@v2
        with:
          repository: jimeh/build-emacs-for-macos
-          ref: "v0.6.9"
+          ref: "v0.6.15"
          path: builder
      - uses: actions/setup-go@v2
        with:
@@ -96,7 +96,7 @@ jobs:
        uses: actions/checkout@v2
        with:
          repository: jimeh/build-emacs-for-macos
-          ref: "v0.6.9"
+          ref: "v0.6.15"
          path: builder
      - uses: ruby/setup-ruby@v1
        with:
@@ -121,7 +121,8 @@ jobs:
      - name: Build Emacs
        run: >-
          ./builder/build-emacs-for-macos --plan build-plan.yml
-          --native-full-aot ${{ github.event.inputs.extraBuildArgs }}
+          --no-relink-eln-files --native-full-aot --no-archive
+          ${{ github.event.inputs.extraBuildArgs }}
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      - name: Install the Apple signing certificate
--- a/.github/workflows/test-build.yml
+++ b/.github/workflows/test-build.yml
@@ -29,7 +29,7 @@ on:
      extraBuildArgs:
        description: "Extra build args"
        required: false
-        default: ""
+        default: "--native-full-aot --no-relink-eln-files"
      extraPackageArgs:
        description: "Extra package args"
        required: false
@@ -43,7 +43,8 @@ jobs:
  plan:
    runs-on: macos-10.15
    outputs:
-      check: "${{ steps.check.outcome }}"
+      check: ${{ steps.check.outcome }}
+      builder_sha: ${{ steps.builder_sha.outputs.sha }}
    steps:
      - name: Checkout build-emacs-for-macos repo
        uses: actions/checkout@v2
@@ -51,11 +52,14 @@ jobs:
          repository: jimeh/build-emacs-for-macos
          ref: ${{ github.event.inputs.emacsBuilderGitRef }}
          path: builder
+      - name: Store builder Git SHA
+        id: builder_sha
+        run: echo "::set-output name=sha::$(git rev-parse HEAD)"
+        working-directory: builder
      - uses: actions/setup-go@v2
        with:
          go-version: 1.16
      - uses: actions/cache@v2
-        id: builder-cache
        with:
          path: ~/go/pkg/mod
          key: ${{ runner.os }}-go-${{ hashFiles('builder/**/go.sum') }}
@@ -107,7 +111,7 @@ jobs:
        uses: actions/checkout@v2
        with:
          repository: jimeh/build-emacs-for-macos
-          ref: ${{ github.event.inputs.emacsBuilderGitRef }}
+          ref: ${{ needs.plan.outputs.builder_sha }}
          path: builder
      - uses: ruby/setup-ruby@v1
        with:
@@ -115,9 +119,39 @@ jobs:
      - name: Install dependencies
        run: make bootstrap-ci
        working-directory: builder
+      - name: Download build-plan.yml artifact
+        uses: actions/download-artifact@v2
+        with:
+          name: build-plan.yml
+          path: ./
+      - name: Build Emacs
+        run: >-
+          ./builder/build-emacs-for-macos --plan build-plan.yml
+          ${{ github.event.inputs.extraBuildArgs }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Upload unsigned app artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: unsigned-app
+          path: builds/*.tbz
+          if-no-files-found: error
+
+  package:
+    runs-on: macos-10.15
+    needs: [build]
+    steps:
+      - name: Download unsigned app artifact
+        uses: actions/download-artifact@v2
+        with:
+          name: unsigned-app
+          path: builds
+      - name: Extract unsigned app archive
+        run: |
+          find * -name '*.tbz' -exec tar xvjf "{}" \;
+        working-directory: builds
      - name: Download pre-built emacs-builder artifact
        uses: actions/download-artifact@v2
-        id: builder
        with:
          name: emacs-builder
          path: bin
@@ -125,16 +159,9 @@ jobs:
        run: chmod +x bin/emacs-builder
      - name: Download build-plan.yml artifact
        uses: actions/download-artifact@v2
-        id: plan
        with:
          name: build-plan.yml
          path: ./
-      - name: Build Emacs
-        run: >-
-          ./builder/build-emacs-for-macos --plan build-plan.yml
-          --native-full-aot ${{ github.event.inputs.extraBuildArgs }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      - name: Install the Apple signing certificate
        run: |
          # create variables
@@ -160,8 +187,7 @@ jobs:
      - name: Sign, package and notarize build
        run: >-
          bin/emacs-builder -l debug package -v --plan build-plan.yml
-          --sign --remove-source-dir
-          ${{ github.event.inputs.extraPackageArgs }}
+          --sign ${{ github.event.inputs.extraPackageArgs }}
        env:
          AC_USERNAME: ${{ secrets.AC_USERNAME }}
          AC_PASSWORD: ${{ secrets.AC_PASSWORD }}
@@ -170,7 +196,7 @@ jobs:
      - name: Upload disk image artifacts
        uses: actions/upload-artifact@v2
        with:
-          name: dmg
+          name: signed-dmg
          path: |
            builds/*.dmg
            builds/*.sha*
@@ -182,11 +208,10 @@ jobs:

  release:
    runs-on: macos-10.15
-    needs: [build]
+    needs: [package]
    steps:
      - name: Download pre-built emacs-builder artifact
        uses: actions/download-artifact@v2
-        id: builder
        with:
          name: emacs-builder
          path: bin
@@ -194,14 +219,13 @@ jobs:
        run: chmod +x bin/emacs-builder
      - name: Download build-plan.yml artifact
        uses: actions/download-artifact@v2
-        id: plan
        with:
          name: build-plan.yml
          path: ./
      - name: Download disk image artifact
        uses: actions/download-artifact@v2
        with:
-          name: dmg
+          name: signed-dmg
          path: builds
      - name: Publish disk image to GitHub Release
        run: >-
Author	SHA1	Message	Date
Jim Myhrberg	1f67047d8d	fix(build): add missing --no-archive flag to build script	2021-08-05 10:36:18 +01:00
Jim Myhrberg	9809dd349e	fix(test-build): build plan is needed by package job	2021-08-05 10:35:55 +01:00
Jim Myhrberg	a4b07f609d	chore(deps): update build-emacs-for-macos to 0.6.15	2021-08-05 02:39:18 +01:00
Jim Myhrberg	1049006024	chore(deps): update build-emacs-for-macos to 0.6.14	2021-08-05 01:22:09 +01:00
Jim Myhrberg	1ba8aaecfd	chore(test-build): fix builder sha lookup, remove caching The caching idea is somewhat flawed, as there's a lot of things that cane effect the outcome, and they're difficult to boil down into a single unique key.	2021-08-05 01:21:02 +01:00
Jim Myhrberg	6561dc4a02	chore(test-build): cache unsigned app based on builder git sha and build-plan.yml hash	2021-08-05 00:44:40 +01:00
Jim Myhrberg	dae8939b35	fix(build): disable relinking shared libs in .eln files Relinking the libgcc shared lib within bundled .eln files seems to prevent code signing from having enough space to add a signature to the files. So for now it looks like we have to disable it.	2021-08-05 00:11:17 +01:00
Jim Myhrberg	baea14c975	chore(deps): update build-emacs-for-macos to 0.6.13	2021-08-05 00:08:00 +01:00
Jim Myhrberg	ee9e58b873	chore(deps): update build-emacs-for-macos to 0.6.12 Should resolve code signing issue which has been preventing new nightly builds.	2021-08-03 00:20:40 +01:00
Jim Myhrberg	04d20d42a4	chore(deps): update build-emacs-for-macos to 0.6.11 Fixes issue with code signing *.eln files.	2021-07-17 13:10:18 +01:00
Jim Myhrberg	259b0ac92b	chore(deps): update build-emacs-for-macos to 0.6.9 Fixes: - native-comp: *.eln files were not being found during shared lib embedding	2021-07-17 00:27:58 +01:00