Skip to content

Commit d463521

Browse files
takaxptakaxp
committed
Emacs 29.4
1 parent c814390 commit d463521

File tree

5 files changed

+28
-31
lines changed

5 files changed

+28
-31
lines changed

‎.github/workflows/release-latest.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "Release v29.3 (inline)"
1+
name: "Release v29.4 (inline)"
22
on:
33
workflow_dispatch:
44

@@ -44,14 +44,14 @@ jobs:
4444
xcrun notarytool store-credentials "github-emacs-build" --apple-id $APPLE_ID --team-id "H2PH8KNN3H" --password $APP_PASSWORD
4545
- name: Setup to build
4646
run: sh build/setup.sh
47-
- name: Build Emacs 29.3 with inline patch
47+
- name: Build Emacs 29.4 with inline patch
4848
run: sh build/emacs-29.sh -d ${{ github.workspace }} -p inline
4949
- name: Verification
50-
run: ${{ github.workspace }}/emacs-29.3/nextstep/Emacs.app/Contents/MacOS/Emacs --batch --eval="(unless (fboundp 'mac-input-method-mode) (error \"The inline-patch is NOT integrated\"))"
50+
run: ${{ github.workspace }}/emacs-29.4/nextstep/Emacs.app/Contents/MacOS/Emacs --batch --eval="(unless (fboundp 'mac-input-method-mode) (error \"The inline-patch is NOT integrated\"))"
5151
- name: Portable
52-
run: sh release/portable-emacs.sh -v 29.3 -d ${{ github.workspace }}
52+
run: sh release/portable-emacs.sh -v 29.4 -d ${{ github.workspace }}
5353
- name: Notarize
54-
run: sh release/notarize-emacs.sh -v 29.3 -d ${{ github.workspace }} -s ${{ github.workspace }} -p inline -a "github-emacs-build"
54+
run: sh release/notarize-emacs.sh -v 29.4 -d ${{ github.workspace }} -s ${{ github.workspace }} -p inline -a "github-emacs-build"
5555
- name: Export
5656
env:
5757
ORZ_HOST: ${{ secrets.ORZ_HOST }}
@@ -110,14 +110,14 @@ jobs:
110110
xcrun notarytool store-credentials "github-emacs-build" --apple-id $APPLE_ID --team-id "H2PH8KNN3H" --password $APP_PASSWORD
111111
- name: Setup to build
112112
run: sh build/setup.sh
113-
- name: Build Emacs 29.3 with inline patch
113+
- name: Build Emacs 29.4 with inline patch
114114
run: sh build/emacs-29.sh -d ${{ github.workspace }} -p inline
115115
- name: Verification
116-
run: ${{ github.workspace }}/emacs-29.3/nextstep/Emacs.app/Contents/MacOS/Emacs --batch --eval="(unless (fboundp 'mac-input-method-mode) (error \"The inline-patch is NOT integrated\"))"
116+
run: ${{ github.workspace }}/emacs-29.4/nextstep/Emacs.app/Contents/MacOS/Emacs --batch --eval="(unless (fboundp 'mac-input-method-mode) (error \"The inline-patch is NOT integrated\"))"
117117
- name: Portable
118-
run: sh release/portable-emacs.sh -v 29.3 -d ${{ github.workspace }}
118+
run: sh release/portable-emacs.sh -v 29.4 -d ${{ github.workspace }}
119119
- name: Notarize
120-
run: sh release/notarize-emacs.sh -v 29.3 -d ${{ github.workspace }} -s ${{ github.workspace }} -p inline -a "github-emacs-build"
120+
run: sh release/notarize-emacs.sh -v 29.4 -d ${{ github.workspace }} -s ${{ github.workspace }} -p inline -a "github-emacs-build"
121121
- name: Export
122122
env:
123123
ORZ_HOST: ${{ secrets.ORZ_HOST }}

‎.github/workflows/release-latest_native.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "Release v29.3 (NativeComp)"
1+
name: "Release v29.4 (NativeComp)"
22
on:
33
workflow_dispatch:
44

@@ -44,14 +44,14 @@ jobs:
4444
xcrun notarytool store-credentials "github-emacs-build" --apple-id $APPLE_ID --team-id "H2PH8KNN3H" --password $APP_PASSWORD
4545
- name: Setup to build
4646
run: sh build/setup.sh
47-
- name: Build Emacs 29.3 with inline patch
47+
- name: Build Emacs 29.4 with inline patch
4848
run: sh build/emacs-29.sh -d ${{ github.workspace }} -p inline -n
4949
- name: Verification
50-
run: ${{ github.workspace }}/emacs-29.3/nextstep/Emacs.app/Contents/MacOS/Emacs --batch --eval="(unless (fboundp 'mac-input-method-mode) (error \"The inline-patch is NOT integrated\"))"
50+
run: ${{ github.workspace }}/emacs-29.4/nextstep/Emacs.app/Contents/MacOS/Emacs --batch --eval="(unless (fboundp 'mac-input-method-mode) (error \"The inline-patch is NOT integrated\"))"
5151
- name: Portable
52-
run: sh release/portable-emacs.sh -v 29.3 -d ${{ github.workspace }}
52+
run: sh release/portable-emacs.sh -v 29.4 -d ${{ github.workspace }}
5353
- name: Notarize
54-
run: sh release/notarize-emacs.sh -v 29.3 -d ${{ github.workspace }} -s ${{ github.workspace }} -p inline -a "github-emacs-build"
54+
run: sh release/notarize-emacs.sh -v 29.4 -d ${{ github.workspace }} -s ${{ github.workspace }} -p inline -a "github-emacs-build"
5555
- name: Export
5656
env:
5757
ORZ_HOST: ${{ secrets.ORZ_HOST }}
@@ -110,14 +110,14 @@ jobs:
110110
xcrun notarytool store-credentials "github-emacs-build" --apple-id $APPLE_ID --team-id "H2PH8KNN3H" --password $APP_PASSWORD
111111
- name: Setup to build
112112
run: sh build/setup.sh
113-
- name: Build Emacs 29.3 with inline patch
113+
- name: Build Emacs 29.4 with inline patch
114114
run: sh build/emacs-29.sh -d ${{ github.workspace }} -p inline -n
115115
- name: Verification
116-
run: ${{ github.workspace }}/emacs-29.3/nextstep/Emacs.app/Contents/MacOS/Emacs --batch --eval="(unless (fboundp 'mac-input-method-mode) (error \"The inline-patch is NOT integrated\"))"
116+
run: ${{ github.workspace }}/emacs-29.4/nextstep/Emacs.app/Contents/MacOS/Emacs --batch --eval="(unless (fboundp 'mac-input-method-mode) (error \"The inline-patch is NOT integrated\"))"
117117
- name: Portable
118-
run: sh release/portable-emacs.sh -v 29.3 -d ${{ github.workspace }}
118+
run: sh release/portable-emacs.sh -v 29.4 -d ${{ github.workspace }}
119119
- name: Notarize
120-
run: sh release/notarize-emacs.sh -v 29.3 -d ${{ github.workspace }} -s ${{ github.workspace }} -p inline -a "github-emacs-build"
120+
run: sh release/notarize-emacs.sh -v 29.4 -d ${{ github.workspace }} -s ${{ github.workspace }} -p inline -a "github-emacs-build"
121121
- name: Export
122122
env:
123123
ORZ_HOST: ${{ secrets.ORZ_HOST }}

‎.github/workflows/release-latest_pure.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "Release v29.3 (pure)"
1+
name: "Release v29.4 (pure)"
22
on:
33
workflow_dispatch:
44

@@ -44,14 +44,14 @@ jobs:
4444
xcrun notarytool store-credentials "github-emacs-build" --apple-id $APPLE_ID --team-id "H2PH8KNN3H" --password $APP_PASSWORD
4545
- name: Setup to build
4646
run: sh build/setup.sh
47-
- name: Build Emacs 29.3
47+
- name: Build Emacs 29.4
4848
run: sh build/emacs-29.sh -d ${{ github.workspace }} -p pure
4949
- name: Verification
50-
run: ${{ github.workspace }}/emacs-29.3/nextstep/Emacs.app/Contents/MacOS/Emacs --batch --eval="(when (fboundp 'mac-input-method-mode) (error \"The inline-patch is integrated for pure package\"))"
50+
run: ${{ github.workspace }}/emacs-29.4/nextstep/Emacs.app/Contents/MacOS/Emacs --batch --eval="(when (fboundp 'mac-input-method-mode) (error \"The inline-patch is integrated for pure package\"))"
5151
- name: Portable
52-
run: sh release/portable-emacs.sh -v 29.3 -d ${{ github.workspace }}
52+
run: sh release/portable-emacs.sh -v 29.4 -d ${{ github.workspace }}
5353
- name: Notarize
54-
run: sh release/notarize-emacs.sh -v 29.3 -d ${{ github.workspace }} -s ${{ github.workspace }} -p pure -a "github-emacs-build"
54+
run: sh release/notarize-emacs.sh -v 29.4 -d ${{ github.workspace }} -s ${{ github.workspace }} -p pure -a "github-emacs-build"
5555
- name: Export
5656
env:
5757
ORZ_HOST: ${{ secrets.ORZ_HOST }}
@@ -110,14 +110,14 @@ jobs:
110110
xcrun notarytool store-credentials "github-emacs-build" --apple-id $APPLE_ID --team-id "H2PH8KNN3H" --password $APP_PASSWORD
111111
- name: Setup to build
112112
run: sh build/setup.sh
113-
- name: Build Emacs 29.3
113+
- name: Build Emacs 29.4
114114
run: sh build/emacs-29.sh -d ${{ github.workspace }} -p pure
115115
- name: Verification
116-
run: ${{ github.workspace }}/emacs-29.3/nextstep/Emacs.app/Contents/MacOS/Emacs --batch --eval="(when (fboundp 'mac-input-method-mode) (error \"The inline-patch is integrated for pure package\"))"
116+
run: ${{ github.workspace }}/emacs-29.4/nextstep/Emacs.app/Contents/MacOS/Emacs --batch --eval="(when (fboundp 'mac-input-method-mode) (error \"The inline-patch is integrated for pure package\"))"
117117
- name: Portable
118-
run: sh release/portable-emacs.sh -v 29.3 -d ${{ github.workspace }}
118+
run: sh release/portable-emacs.sh -v 29.4 -d ${{ github.workspace }}
119119
- name: Notarize
120-
run: sh release/notarize-emacs.sh -v 29.3 -d ${{ github.workspace }} -s ${{ github.workspace }} -p pure -a "github-emacs-build"
120+
run: sh release/notarize-emacs.sh -v 29.4 -d ${{ github.workspace }} -s ${{ github.workspace }} -p pure -a "github-emacs-build"
121121
- name: Export
122122
env:
123123
ORZ_HOST: ${{ secrets.ORZ_HOST }}

‎build/emacs-29.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
VERSION=29.3
3+
VERSION=29.4
44

55
# LIBXML2 for Catalina
66
MACSDK=`xcrun --show-sdk-path`

‎build/setup.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,11 @@ function install_deps () {
2525
# Required to support NativeComp
2626
brew install gcc libgccjit
2727

28-
echo "------------------------------------"
29-
echo "$(uname -m)"
3028
if [ $(uname -m) = "x86_64" ]; then
3129
echo "--- Hot fix for libgccjit 14.1 on x86_64"
3230
cd /usr/local/opt/libgccjit/lib/gcc/current
3331
ln -s /usr/local/lib/gcc/current/libgcc_s.1.1.dylib .
3432
fi
35-
echo "------------------------------------"
3633
}
3734

3835
function install_tool () {

0 commit comments

Comments
 (0)