always use repo version

Author: blahgeek

.github/workflows/build.yml

@@ -44,11 +44,11 @@ jobs:
       matrix:
         source:
           - name: "29.1"
-            tarball: "https://ftp.gnu.org/gnu/emacs/emacs-29.1.tar.gz"
-            tarball_dir: "emacs-29.1"
+            repo: "emacs-mirror/emacs"
+            ref: "emacs-29.1"
           - name: "29.1_native_json_rpc"
             repo: "blahgeek/emacs"
-            commit: "b8e9c30dcae19eaa8deed9bd594e84d5cf6244cb"
+            ref: "b8e9c30dcae19eaa8deed9bd594e84d5cf6244cb"
         build_with_x11: [ "yes", "no" ]
 
     steps:
@@ -58,19 +58,12 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
 
-    - name: Download emacs source from tarball
-      run: |
-        curl -L ${{ matrix.source.tarball }} | tar xz
-        mv ${{ matrix.source.tarball_dir }} emacs-src
-      if: ${{ matrix.source.tarball }}
-
     - name: Download emacs source from repo
       uses: actions/checkout@v4
       with:
         repository: ${{ matrix.source.repo }}
-        ref: ${{ matrix.source.commit }}
+        ref: ${{ matrix.source.ref }}
         path: emacs-src
-      if: ${{ matrix.source.repo }}
 
     - name: Download artifact
       uses: actions/download-artifact@v2
@@ -84,7 +77,7 @@ jobs:
         docker image ls -a
 
     - name: Run and package
-      run: ./run-and-package.sh builder-image:latest ./emacs-src BUILD_WITH_X11=${{ matrix.build_with_x11 }} BUILD_RUN_AUTOGEN=${{ matrix.source.repo && 'yes' || 'no' }}
+      run: ./run-and-package.sh builder-image:latest ./emacs-src BUILD_WITH_X11=${{ matrix.build_with_x11 }}
 
     - name: Upload binary to release
       uses: svenstaro/upload-release-action@v2

build-local.sh

@@ -5,12 +5,10 @@ rm -rf ./dist ./build
 
 mkdir build
 pushd build
-wget https://ftp.gnu.org/gnu/emacs/emacs-29.1.tar.xz
-tar xf emacs-29.1.tar.xz
-mv emacs-29.1 emacs-src
+git clone -b json-rpc-29 --depth 1 https://github.com/blahgeek/emacs emacs-src
 popd
 
 docker build .  # next step has no log, so build first
 IMAGE_ID=$(docker build -q .)
 
-./run-and-package.sh "$IMAGE_ID" ./build/emacs-src BUILD_WITH_X11=yes
+./run-and-package.sh "$IMAGE_ID" ./build/emacs-src BUILD_WITH_X11=no

scripts/build_emacs_in_docker.sh

@@ -8,9 +8,7 @@ cp -r emacs-src emacs
 
 pushd emacs
 
-if [ "$BUILD_RUN_AUTOGEN" = "yes" ]; then
-    ./autogen.sh
-fi
+./autogen.sh
 
 ARGS=""
 ARGS+=" --disable-locallisppath"
@@ -38,11 +36,7 @@ env \
 env \
     PATH=$DIST_APPDIR/bin:$PATH \
     LD_LIBRARY_PATH=$DIST_APPDIR/lib \
-    make -j$(nproc)
-env \
-    PATH=$DIST_APPDIR/bin:$PATH \
-    LD_LIBRARY_PATH=$DIST_APPDIR/lib \
-    make install-strip
+    bash -c "make -j$(nproc) && make install"
 popd
 
 cp $SCRIPT_DIR/AppRun $DIST_APPDIR/AppRun