Merge branch 'dev-aarch64'

blahgeek · blahgeek · commit 8ef35ed40d4c · 2025-02-22T10:34:04.000+08:00
diff --git a/.github/workflows/_build-emacs.yml b/.github/workflows/_build-emacs.yml
@@ -7,6 +7,9 @@ on:
       branch:
         required: true
         type: string
+      arch:
+        required: true
+        type: string
       patch:
         type: string
       build_gui:
@@ -27,9 +30,14 @@ on:
 jobs:
 
   build-emacs:
-    runs-on: ubuntu-latest
+    runs-on: ${{ inputs.arch == 'aarch64' && 'ubuntu-24.04-arm' || 'ubuntu-latest' }}
 
     steps:
+    - name: Confirm arch
+      run: |
+        echo $(uname -m)
+        test $(uname -m) = ${{ inputs.arch }}
+
     - name: Install fuse
       run: sudo apt-get install -y fuse libfuse2
 
@@ -51,33 +59,33 @@ jobs:
     - name: Download builder image
       uses: actions/download-artifact@v4
       with:
-        name: builder-image
+        name: ${{ inputs.arch }}-builder-image
         path: /tmp
 
     - name: Load builder image
       run: |
-        docker load -i /tmp/builder-image.tar
+        docker load -i /tmp/${{ inputs.arch }}-builder-image.tar
         docker image ls -a
 
     - name: Download tester ubuntu2004 image
       if: ${{ inputs.do_test }}
       uses: actions/download-artifact@v4
       with:
-        name: tester-image_ubuntu2004
+        name: ${{ inputs.arch }}-tester-image_ubuntu2004
         path: /tmp
 
     - name: Download tester archlinux image
       if: ${{ inputs.do_test }}
       uses: actions/download-artifact@v4
       with:
-        name: tester-image_archlinux
+        name: ${{ inputs.arch }}-tester-image_archlinux
         path: /tmp
 
     - name: Load tester image
       if: ${{ inputs.do_test }}
       run: |
-        docker load -i /tmp/tester-image_ubuntu2004.tar
-        docker load -i /tmp/tester-image_archlinux.tar
+        docker load -i /tmp/${{ inputs.arch }}-tester-image_ubuntu2004.tar
+        docker load -i /tmp/${{ inputs.arch }}-tester-image_archlinux.tar
         docker image ls -a
 
     - name: Build and package
@@ -98,7 +106,7 @@ jobs:
     - name: Upload binary as artifact
       uses: actions/upload-artifact@v4
       with:
-        name: Emacs-${{ inputs.name }}-${{ inputs.build_gui }}.AppImage
+        name: Emacs-${{ inputs.name }}-${{ inputs.build_gui }}-${{ inputs.arch }}.AppImage
         path: dist/Emacs.AppImage
         compression-level: 0
 
@@ -108,7 +116,7 @@ jobs:
       with:
         repo_token: ${{ secrets.GITHUB_TOKEN }}
         file: dist/Emacs.AppImage
-        asset_name: Emacs-${{ inputs.name }}-${{ inputs.build_gui }}.AppImage
+        asset_name: Emacs-${{ inputs.name }}-${{ inputs.build_gui }}-${{ inputs.arch }}.AppImage
         tag: github-action-build-${{ github.run_id }}
         release_name: ${{ inputs.release_name }}
         prerelease: ${{ !inputs.release_latest }}
diff --git a/.github/workflows/_prepare-docker.yml b/.github/workflows/_prepare-docker.yml
@@ -1,9 +1,13 @@
 on:
   workflow_call:
+    inputs:
+      arch:
+        required: true
+        type: string
 
 jobs:
   prepare-builder-docker:
-    runs-on: ubuntu-latest
+    runs-on: ${{ inputs.arch == 'aarch64' && 'ubuntu-24.04-arm' || 'ubuntu-latest' }}
 
     steps:
     - name: Checkout
@@ -19,17 +23,18 @@ jobs:
         cache-from: type=gha
         cache-to: type=gha,mode=max
         tags: builder-image:latest
-        outputs: type=docker,dest=/tmp/builder-image.tar
+        outputs: type=docker,dest=/tmp/${{ inputs.arch }}-builder-image.tar
 
     - name: Upload artifact
       uses: actions/upload-artifact@v4
       with:
-        name: builder-image
-        path: /tmp/builder-image.tar
+        name: ${{ inputs.arch }}-builder-image
+        path: /tmp/${{ inputs.arch }}-builder-image.tar
         compression-level: 0
 
   prepare-tester-docker-ubuntu2004:
-    runs-on: ubuntu-latest
+    if: ${{ inputs.arch == 'x86_64' }}
+    runs-on: 'ubuntu-latest'
 
     steps:
     - name: Checkout
@@ -45,16 +50,17 @@ jobs:
         # cache-from: type=gha
         # cache-to: type=gha,mode=max
         tags: tester-image_ubuntu2004:latest
-        outputs: type=docker,dest=/tmp/tester-image_ubuntu2004.tar
+        outputs: type=docker,dest=/tmp/${{ inputs.arch }}-tester-image_ubuntu2004.tar
 
     - name: Upload artifact
       uses: actions/upload-artifact@v4
       with:
-        name: tester-image_ubuntu2004
-        path: /tmp/tester-image_ubuntu2004.tar
+        name: ${{ inputs.arch }}-tester-image_ubuntu2004
+        path: /tmp/${{ inputs.arch }}-tester-image_ubuntu2004.tar
         compression-level: 0
 
   prepare-tester-docker-archlinux:
+    if: ${{ inputs.arch == 'x86_64' }}
     runs-on: ubuntu-latest
 
     steps:
@@ -71,11 +77,11 @@ jobs:
         # cache-from: type=gha
         # cache-to: type=gha,mode=max
         tags: tester-image_archlinux:latest
-        outputs: type=docker,dest=/tmp/tester-image_archlinux.tar
+        outputs: type=docker,dest=/tmp/${{ inputs.arch }}-tester-image_archlinux.tar
 
     - name: Upload artifact
       uses: actions/upload-artifact@v4
       with:
-        name: tester-image_archlinux
-        path: /tmp/tester-image_archlinux.tar
+        name: ${{ inputs.arch }}-tester-image_archlinux
+        path: /tmp/${{ inputs.arch }}-tester-image_archlinux.tar
         compression-level: 0
diff --git a/.github/workflows/daily-master.yml b/.github/workflows/daily-master.yml
@@ -16,6 +16,13 @@ jobs:
 
   prepare-docker:
     uses: ./.github/workflows/_prepare-docker.yml
+    with:
+      arch: ${{ matrix.arch }}
+    strategy:
+      matrix:
+        arch:
+          - x86_64
+          - aarch64
 
   setup-vars:
     runs-on: ubuntu-latest
@@ -38,14 +45,18 @@ jobs:
           - x11
           - pgtk
           - nox
+        arch:
+          - x86_64
+          - aarch64
 
     uses: ./.github/workflows/_build-emacs.yml
     with:
       name: master
+      arch: ${{ matrix.arch }}
       branch: master
       build_gui: ${{ matrix.build_gui }}
       build_native_comp: aot
-      do_test: true
+      do_test: ${{ matrix.arch == 'x86_64' }}
       do_release: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
       release_name: Daily master build ${{ needs.setup-vars.outputs.datetimestr }}
       release_latest: false
diff --git a/.github/workflows/daily-mps.yml b/.github/workflows/daily-mps.yml
@@ -16,6 +16,13 @@ jobs:
 
   prepare-docker:
     uses: ./.github/workflows/_prepare-docker.yml
+    with:
+      arch: ${{ matrix.arch }}
+    strategy:
+      matrix:
+        arch:
+          - x86_64
+          - aarch64
 
   setup-vars:
     runs-on: ubuntu-latest
@@ -41,10 +48,14 @@ jobs:
         build_native_comp:
           - "no"
           - "aot"
+        arch:
+          - x86_64
+          - aarch64
 
     uses: ./.github/workflows/_build-emacs.yml
     with:
       name: mps-${{ matrix.build_native_comp == 'no' && 'no_native_comp' || 'native_comp' }}
+      arch: ${{ matrix.arch }}
       branch: feature/igc
       build_gui: ${{ matrix.build_gui }}
       build_native_comp: ${{ matrix.build_native_comp }}
diff --git a/build.sh b/build.sh
@@ -23,9 +23,10 @@ docker run \
 docker cp $CONTAINER_ID:/work/dist ./dist
 
 # download appimagetool-x86_64.AppImage if not exists
-if [ ! -f ./appimagetool-x86_64.AppImage ]; then
-    wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
-    chmod +x ./appimagetool-x86_64.AppImage
+if [ ! -f ./appimagetool.AppImage ]; then
+    wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-$(uname -m).AppImage \
+         -O ./appimagetool.AppImage
+    chmod +x ./appimagetool.AppImage
 fi
 
-ARCH=x86_64 ./appimagetool-x86_64.AppImage --no-appstream ./dist/AppDir ./dist/Emacs.AppImage
+ARCH=$(uname -m) ./appimagetool.AppImage --no-appstream ./dist/AppDir ./dist/Emacs.AppImage
diff --git a/scripts/AppRun b/scripts/AppRun
@@ -7,7 +7,7 @@ VERSION=$(readlink "$APPIMAGE_ROOT/bin/emacs" | sed -e 's/emacs-//')
 export EMACSLOADPATH="$APPIMAGE_ROOT/share/emacs/$VERSION/lisp"
 export EMACSDATA="$APPIMAGE_ROOT/share/emacs/$VERSION/etc"
 export EMACSDOC="$APPIMAGE_ROOT/share/emacs/$VERSION/etc"
-export EMACSPATH="$APPIMAGE_ROOT/libexec/emacs/$VERSION/x86_64-pc-linux-gnu"
+export EMACSPATH="$APPIMAGE_ROOT/libexec/emacs/$VERSION/*"
 export PATH="$APPIMAGE_ROOT/bin:$PATH"
 
 # check --emacs-appimage-run-as argument
diff --git a/scripts/build_emacs_in_docker.sh b/scripts/build_emacs_in_docker.sh
@@ -37,7 +37,7 @@ if [ "$BUILD_GUI" != "no" ]; then
     ARGS+=" --with-gif --with-png --with-rsvg --with-webp"
     ARGS+=" --with-harfbuzz --with-cairo --with-libotf --without-m17n-flt"
     # use static lib for libjpeg, to prevent incompatible libjpeg.so version because it's depend by gtk
-    ARGS+=" --with-jpeg emacs_cv_jpeglib=/usr/lib/x86_64-linux-gnu/libjpeg.a"
+    ARGS+=" --with-jpeg emacs_cv_jpeglib=/usr/lib/$(uname -m)-linux-gnu/libjpeg.a"
 fi
 
 
