Skip to content

Commit d7bfe16

Browse files
committed
chore: switch to emacs-ng repo
1 parent 1dd8a0a commit d7bfe16

File tree

5 files changed

+15
-42
lines changed

5 files changed

+15
-42
lines changed

.github/workflows/_build.yml

Lines changed: 3 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,10 @@ jobs:
132132
# Only run if check for existing release and asset failed.
133133
if: ${{ needs.plan.outputs.check == 'fail' }}
134134
steps:
135-
- name: Checkout build-emacs-for-macos repo
135+
- name: Checkout build-emacsng-for-macos repo
136136
uses: actions/checkout@v2
137137
with:
138-
repository: jimeh/build-emacs-for-macos
138+
repository: emacs-ng/build-emacsng-for-macos
139139
ref: ${{ needs.prepare.outputs.builder_sha }}
140140
path: builder
141141
- uses: ruby/setup-ruby@v1
@@ -207,37 +207,10 @@ jobs:
207207
run: |
208208
find * -name '*.tbz' -exec tar xvjf "{}" \;
209209
working-directory: builds
210-
- name: Install the Apple signing certificate
211-
run: |
212-
# create variables
213-
CERTIFICATE_PATH="$RUNNER_TEMP/build_certificate.p12"
214-
KEYCHAIN_PATH="$RUNNER_TEMP/app-signing.keychain-db"
215-
216-
# import certificate and provisioning profile from secrets
217-
echo -n "$CERT_BASE64" | base64 --decode --output "$CERTIFICATE_PATH"
218-
219-
# create temporary keychain
220-
security create-keychain -p "$KEYCHAIN_PASSWORD" "$KEYCHAIN_PATH"
221-
security set-keychain-settings -lut 21600 "$KEYCHAIN_PATH"
222-
security unlock-keychain -p "$KEYCHAIN_PASSWORD" "$KEYCHAIN_PATH"
223-
224-
# import certificate to keychain
225-
security import "$CERTIFICATE_PATH" -P "$CERT_PASSWORD" -A \
226-
-t cert -f pkcs12 -k "$KEYCHAIN_PATH"
227-
security list-keychain -d user -s "$KEYCHAIN_PATH"
228-
env:
229-
CERT_BASE64: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_P12_BASE64 }}
230-
CERT_PASSWORD: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_PASSWORD }}
231-
KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
232210
- name: Sign, package and notarize build
233211
run: >-
234212
bin/emacs-builder -l debug package -v --plan build-plan.yml
235-
--sign --remove-source-dir
236-
env:
237-
AC_USERNAME: ${{ secrets.AC_USERNAME }}
238-
AC_PASSWORD: ${{ secrets.AC_PASSWORD }}
239-
AC_PROVIDER: ${{ secrets.AC_PROVIDER }}
240-
AC_SIGN_IDENTITY: ${{ secrets.AC_SIGN_IDENTITY }}
213+
--remove-source-dir
241214
- name: Upload disk image artifacts
242215
uses: actions/upload-artifact@v3
243216
with:
@@ -246,7 +219,3 @@ jobs:
246219
builds/*.dmg
247220
builds/*.sha*
248221
if-no-files-found: error
249-
- name: Clean up keychain used for signing certificate
250-
if: ${{ always() }}
251-
run: |
252-
security delete-keychain "$RUNNER_TEMP/app-signing.keychain-db"

.github/workflows/_prepare.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
description: Git ref to checkout of build-emacs-for-macos
88
required: false
99
type: string
10-
default: "v0.6.41"
10+
default: "master"
1111
secrets:
1212
TAP_REPO_TOKEN:
1313
description: Personal Access Token for Homebrew Tap repo
@@ -19,10 +19,10 @@ jobs:
1919
# with later versions of macOS.
2020
runs-on: macos-11
2121
steps:
22-
- name: Checkout build-emacs-for-macos repo
22+
- name: Checkout build-emacsng-for-macos repo
2323
uses: actions/checkout@v3
2424
with:
25-
repository: jimeh/build-emacs-for-macos
25+
repository: declantsien/build-emacs-webrender
2626
ref: ${{ inputs.builder_ref }}
2727
path: builder
2828
- name: Store builder Git SHA

.github/workflows/_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
- name: Trigger update casks workflow in homebrew tap
5151
if: ${{ steps.dmg.outputs.result != 'fail' && inputs.testBuildName == '' }}
5252
run: >-
53-
gh workflow run --repo jimeh/homebrew-emacs-builds update-casks.yml
53+
gh workflow run --repo emacs-ng/homebrew-emacsng-builds update-casks.yml
5454
env:
5555
GITHUB_TOKEN: ${{ secrets.TAP_REPO_TOKEN }}
5656
- run: echo 'No DMG artifact available, was there a new commit to build?'

.github/workflows/nightly-emacs-29.yml renamed to .github/workflows/emacsng-webrender.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: Nightly (emacs-29)
2+
name: Emacs NG with Webrender
33
on:
44
schedule:
55
- cron: "0 23 * * *"
@@ -22,9 +22,9 @@ jobs:
2222
uses: ./.github/workflows/_build.yml
2323
with:
2424
os: macos-11
25-
git_ref: emacs-29
25+
git_ref: master
2626
git_sha: ${{ github.event.inputs.git_sha }}
27-
build_args: --native-comp
27+
build_args: --native-comp --webrender --no-ns
2828
secrets:
2929
APPLE_DEVELOPER_CERTIFICATE_P12_BASE64: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_P12_BASE64 }}
3030
APPLE_DEVELOPER_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_PASSWORD }}
@@ -38,6 +38,8 @@ jobs:
3838
release:
3939
name: Release
4040
needs: [build]
41+
# Only run if check for existing release and asset failed.
42+
if: ${{ needs.build.plan.outputs.check == 'fail' }}
4143
uses: ./.github/workflows/_release.yml
4244
with:
4345
plan_artifact: build-plan

.github/workflows/nightly-master.yml renamed to .github/workflows/emacsng.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: Nightly (master)
2+
name: Emacs NG
33
on:
44
schedule:
55
- cron: "0 23 * * *"
@@ -38,6 +38,8 @@ jobs:
3838
release:
3939
name: Release
4040
needs: [build]
41+
# Only run if check for existing release and asset failed.
42+
if: ${{ needs.build.plan.outputs.check == 'fail' }}
4143
uses: ./.github/workflows/_release.yml
4244
with:
4345
plan_artifact: build-plan

0 commit comments

Comments
 (0)