Compare commits

...

5 Commits

6 changed files with 25 additions and 23 deletions

View File

@@ -78,7 +78,7 @@ jobs:
test_plan_args: ${{ steps.test_plan_args.outputs.args }} test_plan_args: ${{ steps.test_plan_args.outputs.args }}
steps: steps:
- name: Download emacs-builder git SHA artifact - name: Download emacs-builder git SHA artifact
uses: actions/download-artifact@v3 uses: actions/download-artifact@v4
with: with:
name: emacs-builder-git-sha name: emacs-builder-git-sha
path: ./ path: ./
@@ -108,7 +108,7 @@ jobs:
with: with:
repository: jimeh/build-emacs-for-macos repository: jimeh/build-emacs-for-macos
ref: ${{ needs.prepare.outputs.builder_sha }} ref: ${{ needs.prepare.outputs.builder_sha }}
- uses: actions/setup-go@v4 - uses: actions/setup-go@v5
if: ${{ inputs.os != inputs.build_os }} if: ${{ inputs.os != inputs.build_os }}
with: with:
go-version: "1.21" go-version: "1.21"
@@ -117,7 +117,7 @@ jobs:
run: make build run: make build
- name: Download pre-built emacs-builder artifact - name: Download pre-built emacs-builder artifact
if: ${{ inputs.os == inputs.build_os }} if: ${{ inputs.os == inputs.build_os }}
uses: actions/download-artifact@v3 uses: actions/download-artifact@v4
with: with:
name: emacs-builder name: emacs-builder
path: bin path: bin
@@ -136,7 +136,7 @@ jobs:
- name: Show plan - name: Show plan
run: cat build-plan.yml run: cat build-plan.yml
- name: Upload build-plan artifact - name: Upload build-plan artifact
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: ${{ inputs.artifact_prefix }}build-plan name: ${{ inputs.artifact_prefix }}build-plan
path: build-plan.yml path: build-plan.yml
@@ -177,7 +177,7 @@ jobs:
run: make bootstrap run: make bootstrap
working-directory: builder working-directory: builder
- name: Download build-plan artifact - name: Download build-plan artifact
uses: actions/download-artifact@v3 uses: actions/download-artifact@v4
with: with:
name: ${{ inputs.artifact_prefix }}build-plan name: ${{ inputs.artifact_prefix }}build-plan
path: ./ path: ./
@@ -192,13 +192,13 @@ jobs:
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Upload unsigned app artifact - name: Upload unsigned app artifact
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: ${{ inputs.artifact_prefix }}unsigned-app name: ${{ inputs.artifact_prefix }}unsigned-app
path: builds/*.tbz path: builds/*.tbz
if-no-files-found: error if-no-files-found: error
- name: Upload Emacs source artifact - name: Upload Emacs source artifact
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: ${{ inputs.artifact_prefix }}emacs-source name: ${{ inputs.artifact_prefix }}emacs-source
path: builder/tarballs/*.tgz path: builder/tarballs/*.tgz
@@ -207,26 +207,26 @@ jobs:
runs-on: ${{ inputs.os }} runs-on: ${{ inputs.os }}
needs: [prepare, plan, build] needs: [prepare, plan, build]
steps: steps:
- uses: actions/setup-python@v4 - uses: actions/setup-python@v5
with: with:
python-version: "3.11" python-version: "3.11"
- name: Install dmgbuild - name: Install dmgbuild
run: | run: |
$(command -v pip3 || command -v pip) install --upgrade dmgbuild $(command -v pip3 || command -v pip) install --upgrade dmgbuild
- name: Download pre-built emacs-builder artifact - name: Download pre-built emacs-builder artifact
uses: actions/download-artifact@v3 uses: actions/download-artifact@v4
with: with:
name: emacs-builder name: emacs-builder
path: bin path: bin
- name: Ensure emacs-builder is executable - name: Ensure emacs-builder is executable
run: chmod +x bin/emacs-builder run: chmod +x bin/emacs-builder
- name: Download build-plan artifact - name: Download build-plan artifact
uses: actions/download-artifact@v3 uses: actions/download-artifact@v4
with: with:
name: ${{ inputs.artifact_prefix }}build-plan name: ${{ inputs.artifact_prefix }}build-plan
path: ./ path: ./
- name: Download unsigned app artifact - name: Download unsigned app artifact
uses: actions/download-artifact@v3 uses: actions/download-artifact@v4
with: with:
name: ${{ inputs.artifact_prefix }}unsigned-app name: ${{ inputs.artifact_prefix }}unsigned-app
path: builds path: builds
@@ -258,7 +258,7 @@ jobs:
KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }} KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
- name: Sign, package and notarize build - name: Sign, package and notarize build
run: >- 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 --sign --remove-source-dir
env: env:
AC_USERNAME: ${{ secrets.AC_USERNAME }} AC_USERNAME: ${{ secrets.AC_USERNAME }}
@@ -266,7 +266,7 @@ jobs:
AC_PROVIDER: ${{ secrets.AC_PROVIDER }} AC_PROVIDER: ${{ secrets.AC_PROVIDER }}
AC_SIGN_IDENTITY: ${{ secrets.AC_SIGN_IDENTITY }} AC_SIGN_IDENTITY: ${{ secrets.AC_SIGN_IDENTITY }}
- name: Upload disk image artifacts - name: Upload disk image artifacts
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: ${{ inputs.artifact_prefix }}dmg name: ${{ inputs.artifact_prefix }}dmg
path: | path: |

View File

@@ -12,7 +12,7 @@ on:
description: Git ref to checkout of build-emacs-for-macos description: Git ref to checkout of build-emacs-for-macos
required: false required: false
type: string type: string
default: "v0.6.45" default: "v0.6.47"
secrets: secrets:
TAP_REPO_TOKEN: TAP_REPO_TOKEN:
description: Personal Access Token for Homebrew Tap repo description: Personal Access Token for Homebrew Tap repo
@@ -31,18 +31,18 @@ jobs:
run: | run: |
git rev-parse HEAD > emacs-builder-git-sha.txt git rev-parse HEAD > emacs-builder-git-sha.txt
- name: Upload builder git SHA artifact - name: Upload builder git SHA artifact
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: emacs-builder-git-sha name: emacs-builder-git-sha
path: emacs-builder-git-sha.txt path: emacs-builder-git-sha.txt
if-no-files-found: error if-no-files-found: error
- uses: actions/setup-go@v4 - uses: actions/setup-go@v5
with: with:
go-version: "1.21" go-version: "1.21"
- name: Build emacs-builder tool - name: Build emacs-builder tool
run: make build run: make build
- name: Upload emacs-builder artifact - name: Upload emacs-builder artifact
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: emacs-builder name: emacs-builder
path: bin/emacs-builder path: bin/emacs-builder

View File

@@ -36,21 +36,21 @@ jobs:
runs-on: ${{ inputs.os }} runs-on: ${{ inputs.os }}
steps: steps:
- name: Download pre-built emacs-builder artifact - name: Download pre-built emacs-builder artifact
uses: actions/download-artifact@v3 uses: actions/download-artifact@v4
with: with:
name: emacs-builder name: emacs-builder
path: bin path: bin
- name: Ensure emacs-builder is executable - name: Ensure emacs-builder is executable
run: chmod +x bin/emacs-builder run: chmod +x bin/emacs-builder
- name: Download build-plan.yml artifact - name: Download build-plan.yml artifact
uses: actions/download-artifact@v3 uses: actions/download-artifact@v4
with: with:
name: ${{ inputs.plan_artifact }} name: ${{ inputs.plan_artifact }}
path: ./ path: ./
- name: Download disk image artifacts - name: Download disk image artifacts
id: dmg id: dmg
continue-on-error: true continue-on-error: true
uses: actions/download-artifact@v3 uses: actions/download-artifact@v4
with: with:
name: ${{ inputs.dmg_artifact }} name: ${{ inputs.dmg_artifact }}
path: builds path: builds

View File

@@ -13,7 +13,7 @@ on:
builder_ref: builder_ref:
description: "Git ref to checkout of build-emacs-for-macos" description: "Git ref to checkout of build-emacs-for-macos"
required: true required: true
default: "master" default: "v0.6.47"
builder_args: builder_args:
description: Custom arguments passed to build script description: Custom arguments passed to build script
required: false required: false

View File

@@ -63,7 +63,9 @@ jobs:
build_arm64: build_arm64:
name: Build (arm64) name: Build (arm64)
if: github.event.inputs.arm64 || github.event.schedule == '0 23 1 * *' if: >-
github.event.inputs.arm64 == 'true' ||
github.event.schedule == '0 23 1 * *'
uses: ./.github/workflows/_build.yml uses: ./.github/workflows/_build.yml
needs: [prepare] needs: [prepare]
with: with:

View File

@@ -14,7 +14,7 @@ jobs:
uses: actions/checkout@v3 uses: actions/checkout@v3
with: with:
ref: meta ref: meta
- uses: actions/setup-go@v4 - uses: actions/setup-go@v5
with: with:
go-version: "1.21" go-version: "1.21"
- name: update total downloads shield JSON - name: update total downloads shield JSON