refactor: remove trizen and 3rd package + simplify/consolidate Docker image creation

Author: mpsq

.github/workflows/build.yml

@@ -33,51 +33,46 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: ./Dockerfile
-          builder: ${{ steps.buildx.outputs.name }}
-          push: true
-          tags: mpsq/emacs-native-comp-wayland-builder:latest
 
   artifact:
     runs-on: ubuntu-latest
     needs: [image]
     container:
-      image: mpsq/emacs-native-comp-wayland-builder:latest
-      options: --user root
+      image: mpsq/emacs-builder:latest
     env:
       OLD_COMMIT_N: ${{ github.event.inputs.old_commit_n }}
       NEW_COMMIT_N: ${{ github.event.inputs.new_commit_n }}
     steps:
       - name: Prepare artifacts
         run: |
-          pacman --noconfirm -S jq openssh bc
-          cd /home/pcr
+          ./pull.bash
 
           # Get/set version number
-          version=$(ls emacs* | sed -r 's/.*([0-9]{2}\.[0-9]{1,2}\.[0-9]{1,2}\.[0-9]{6}).*/\1/gi')
+          version=$(grep AC_INIT configure.ac | sed -e 's/^.\+\ \([0-9]\+\.[0-9]\+\.[0-9]\+\?\).\+$/\1/')
+          version+="."
+          version+="$NEW_COMMIT_N"
           echo "pkg_version=$version" >> $GITHUB_ENV
 
+          makepkg
+
           # Unpack artifacts
-          mkdir pkg
-          tar xf "$(ls emacs*)" -C pkg
-          rm pkg/.BUILDINFO pkg/.MTREE pkg/.PKGINFO
-          tar czf "$version".tar.gz -C pkg .
+          mkdir out
+          tar xf emacs-1-1-x86_64.pkg.tar.zst -C out
+          rm emacs-1-1-x86_64.pkg.tar.zst
+          rm out/.BUILDINFO out/.MTREE out/.PKGINFO
+          tar czf "$version".tar.gz -C out .
           sum=$(sha512sum "$version".tar.gz | sed -r 's/(.*)\s\s.*/\1/')
           echo "pkg_sum=$sum" >> $GITHUB_ENV
 
           # Get release body
           delta=$(echo "$NEW_COMMIT_N - $OLD_COMMIT_N" | bc)
           echo -en "# Commits since last release\n\n" > body.md
-          echo -en "Check [upstream](https://github.com//flatwhatson/emacs/commits) for the full history.\n\n" >> body.md
+          echo -en "Check [upstream](https://github.com/flatwhatson/emacs/commits) for the full history.\n\n" >> body.md
 
           # Get the list of commits since last release
           curl -s "$UPSTREAM_GH"/commits?per_page="$delta" | \
           # Parse and retain only the commit message + its url
-          jq -r '.[].commit | (.message | capture("(?<id>.+)\n").id) + " [commit](" + .html_url + ")"' | \
+          jq -r '.[] | (.commit.message | capture("(?<id>.+)\n").id) + " [commit](" + .html_url + ")"' | \
           # Remove "Merge" commits
           sed '/^Merge/,+1 d' | \
           # Remove any special char at the beginning of the message
@@ -112,32 +107,28 @@ jobs:
           PRIV_KEY: ${{ secrets.PRIV_KEY }}
           PUB_KEY: ${{ secrets.PUB_KEY }}
         run: |
-          cd /root
           mkdir .ssh
 
           # Setup SSH
           echo "$PUB_KEY" | tr -d '\r' > .ssh/id_aur.pub
           echo "$PRIV_KEY" | base64 --decode > .ssh/id_aur
           chmod 600 .ssh/id_aur
-          echo -en 'Host aur.archlinux.org\n  IdentityFile /root/.ssh/id_aur\n  User aur\n' > .ssh/config
+          echo -en 'Host aur.archlinux.org\n  IdentityFile /home/pcr/.ssh/id_aur\n  User aur\n' > .ssh/config
           ssh-keyscan aur.archlinux.org > .ssh/known_hosts
           ssh-keyscan 95.216.144.15 >> .ssh/known_hosts
 
           # Setup git
-          cd /home/pcr
           git config --global user.name "Méril Pilon"
           git config --global user.email "me@mpsq.org"
           git clone ssh://aur.archlinux.org/emacs-gcc-wayland-devel-bin.git
-          chown -R pcr:pcr emacs-gcc-wayland-devel-bin
           cd emacs-gcc-wayland-devel-bin
 
           # Amend package, set pkgver, sha512 sum and pkgrel + fix permissions
           sed -i -r -e 's~pkgver=.*~pkgver='$PKG_VERSION'~' PKGBUILD
           sed -i -r -e 's~sha512sums=.*~sha512sums=\("'"$PKG_SUM"'"\)~' PKGBUILD
           sed -i -r -e 's/pkgrel=.*/pkgrel=1/' PKGBUILD
-          chown pcr:pcr PKGBUILD
           rm .SRCINFO
-          su pcr -c "makepkg --printsrcinfo > .SRCINFO"
+          makepkg --printsrcinfo > .SRCINFO
 
           # Push changes
           git add .SRCINFO PKGBUILD

Dockerfile

@@ -1,14 +1,67 @@
-FROM mpsq/emacs-native-comp-wayland-builder:latest
+#
+# This Dockerfile is used to build the image "mpsq/emacs-builder".
+# Link: https://hub.docker.com/repository/docker/mpsq/emacs-builder
+#
+# What is the point of this?
+#   - Have an Archlinux environment
+#   - Pull and compile Emacs so it is much faster to produce subsequent binaries
+#
+# This image is obviously then used in the GitHub action to compile Emacs.
+#
+# At the moment, this image is built manually from times to times (= very
+# infrequently). In the future, I might get CI to do it, maybe on a monthly
+# basis.
+#
+FROM archlinux:base-devel
 
+COPY deps .
+
+RUN pacman -Syu --noconfirm && \
+  pacman -U --noconfirm libgccjit-10.2.0-2-x86_64.pkg.tar.zst && \
+  pacman -S --noconfirm \
+  # Emacs deps
+  alsa-lib \
+  cairo \
+  clang \
+  binutils \
+  gnutls \
+  gpm \
+  gtk3 \
+  harfbuzz \
+  jansson \
+  libotf \
+  libxml2 \
+  lld \
+  llvm \
+  webkit2gtk \
+  xorgproto \
+  # Pipeline deps
+  bc \
+  expac \
+  git \
+  jq \
+  openssh && \
+  groupadd -r pcr && useradd --no-log-init -r -g pcr pcr && \
+  mkdir /home/pcr && \
+  chown -R pcr:pcr /home/pcr && \
+  echo "pcr ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/user && \
+  chmod 0440 /etc/sudoers.d/user
+
+WORKDIR /home/pcr
 USER pcr
 
-RUN \
-  rm /home/pcr/emacs* && \
-  trizen \
-  --quiet \
-  --nocolors \
-  --noedit \
-  --noconfirm \
-  --noinstall \
-  --movepkg-dir=/home/pcr \
-  -S emacs-native-comp-git-enhanced
+COPY PKGBUILD .
+COPY pull.bash .
+
+ENV CC="/usr/bin/clang" \
+  CXX="/usr/bin/clang++" \
+  CPP="/usr/bin/clang -E" \
+  LD="/usr/bin/lld" \
+  AR="/usr/bin/llvm-ar" \
+  AS="/usr/bin/llvm-as" \
+  CFLAGS="-g -flto -fuse-ld=lld" \
+  CXXFLAGS="-g -flto -fuse-ld=lld"
+
+RUN ["./pull.bash"]
+RUN makepkg && \
+  rm emacs-1-1-x86_64.pkg.tar.zst

PKGBUILD

@@ -0,0 +1,59 @@
+pkgname=emacs
+pkgver=1
+pkgrel=1
+pkgdesc="The extensible, customizable, self-documenting real-time display editor"
+arch=('x86_64')
+url="https://www.gnu.org/software/emacs/emacs.html"
+license=('GPL3')
+depends=()
+source=()
+sha1sums=()
+
+build() {
+  cd /home/pcr/emacs
+
+  [[ -x configure ]] || ( ./autogen.sh git && ./autogen.sh autoconf )
+
+  _conf=(
+    --prefix=/usr
+    --sysconfdir=/etc
+    --libexecdir=/usr/lib
+    --localstatedir=/var
+    --mandir=/usr/share/man
+    --with-gameuser=:games
+    --with-sound=alsa
+    --with-modules
+    --with-x-toolkit=gtk3
+    --with-cairo
+    --with-xwidgets
+    --with-nativecomp
+    --with-pgtk
+    --without-compress-install
+    --without-gconf
+    --without-gsettings
+    --without-m17n-flt
+    --enable-autodepend
+    --enable-link-time-optimization
+  )
+
+  ./configure --with-nativecomp CC='clang' "${_conf[@]}"
+
+  make -j$(nproc)
+}
+
+package() {
+  cd /home/pcr/emacs
+  make DESTDIR="$pkgdir" install
+
+  mv "$pkgdir"/usr/bin/{ctags,ctags.emacs}
+  mv "$pkgdir"/usr/share/man/man1/{ctags.1,ctags.emacs.1};
+
+  # fix user/root permissions on usr/share files
+  find "$pkgdir"/usr/share/emacs/ | xargs chown root:root
+
+  # fix permssions on /var/games
+  mkdir -p "$pkgdir"/var/games/emacs
+  chmod 775 "$pkgdir"/var/games
+  chmod 775 "$pkgdir"/var/games/emacs
+  chown -R root:games "$pkgdir"/var/games
+}

README.md

@@ -35,13 +35,9 @@ Please create an issue (or, even better, a PR).
 
 # Thanks
 
-All the hard work is done by other people:
-
 - [github.com/masm11](https://github.com/masm11) for the Wayland support
-- [github.com/flatwhatson](https://github.com/flatwhatson) for maitaining a
+- [github.com/flatwhatson](https://github.com/flatwhatson) for maintaining a
   [clean branch](https://github.com/flatwhatson/emacs) with Wayland support
-- [github.com/VitalyAnkh](https://github.com/VitalyAnkh) for
-  [emacs-native-comp-git-enhanced](https://aur.archlinux.org/packages/emacs-native-comp-git-enhanced/)
 - Obviously [core Emacs maintainers](https://www.gnu.org/people/people.en.html)!
 
 # Related

builder/Dockerfile

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+if [[ -d "emacs" ]]; then
+  cd emacs
+  git pull --rebase origin pgtk-nativecomp
+else
+  git clone --depth=1 https://github.com/flatwhatson/emacs
+  cd emacs
+fi