chore(ci): build libgccjit in Docker image (#16)

Author: mpsq

Dockerfile

@@ -6,68 +6,61 @@
 #
 FROM archlinux:base-devel
 
+# See ./assets/variables
 ARG UPSTREAM_BRANCH
 ARG UPSTREAM_REPO
 ARG USR
 ARG USR_HOME
 
-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"
-
 COPY assets/ /assets/
 COPY scripts/ /scripts/
 
+SHELL ["/bin/bash", "-c"]
+
 RUN \
+  # Compilation flags for faster builds
+  MAKEFLAGS="-j$(nproc)" && \
+  export MAKEFLAGS && \
+  # Install deps
   pacman -Syu --noconfirm && \
-  pacman -U --noconfirm /assets/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
-
-RUN \
-  groupadd -r "$USR" && useradd --no-log-init -r -g "$USR" "$USR" && \
+  alsa-lib cairo clang binutils gnutls gpm gtk3 harfbuzz jansson libotf \
+  libxml2 lld llvm webkit2gtk xorgproto \
+  # GitHub Actions deps
+  bc expac git jq openssh \
+  # yay deps
+  go && \
+  # Add $USR user / group with sudo access (for yay)
+  groupadd -r "$USR" && \
+  useradd --no-log-init -r -g "$USR" "$USR" && \
   mkdir "$USR_HOME" && \
   chown -R "$USR":"$USR" "$USR_HOME" && \
   echo "$USR ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/user && \
-  chmod 0440 /etc/sudoers.d/user
+  chmod 0440 /etc/sudoers.d/user && \
+  # Install yay
+  pushd "$USR_HOME" && \
+  su "$USR" -c "git clone https://aur.archlinux.org/yay.git" && \
+  pushd yay && \
+  su "$USR" -c "makepkg -si --noconfirm" && \
+  popd && \
+  # Install su-exec
+  su "$USR" -c "yay -S su-exec --noconfirm" && \
+  # Install libgccjit
+  su-exec "$USR" yay -S libgccjit --noconfirm && \
+  # Copy needed files to $USR_HOME
+  su-exec "$USR" cp /scripts/pull.bash . && \
+  su-exec "$USR" cp /assets/PKGBUILD . && \
+  # Pull Emacs from git repository
+  su-exec "$USR" ./pull.bash && \
+  # Compile Emacs in order to cache artifacts in the image and get better
+  # compilation time in subsequent builds
+  su-exec "$USR" makepkg && \
+  # Cleanup
+  rm -rf /var/cache/ .cache yay emacs-1-1-x86_64.pkg.tar.zst && \
+  su-exec "$USR" yay -Rcns --noconfirm go && \
+  su-exec "$USR" yay -Scc --noconfirm
 
 WORKDIR $USR_HOME
 
 USER $USR
-
-SHELL ["/bin/bash", "-c"]
-
-# We compile Emacs in order to cache artifacts in the image and get better
-# compilation time in subsequent builds.
-RUN \
-  cp /scripts/pull.bash . && \
-  cp /assets/PKGBUILD . && \
-  ./pull.bash && \
-  makepkg && \
-  rm emacs-1-1-x86_64.pkg.tar.zst

assets/PKGBUILD

@@ -10,11 +10,21 @@ source=()
 sha1sums=()
 
 build() {
+  export CC="/usr/bin/clang"
+  export CXX="/usr/bin/clang++"
+  export CPP="/usr/bin/clang -E"
+  export LD="/usr/bin/lld"
+  export AR="/usr/bin/llvm-ar"
+  export AS="/usr/bin/llvm-as"
+  export CFLAGS+=" -g -flto"
+  export CCFLAGS+=" -fuse-ld=lld"
+  export CXXFLAGS+=" -g -flto -fuse-ld=lld"
+
   cd "$USR_HOME"/emacs
 
   [[ -x configure ]] || ( ./autogen.sh git && ./autogen.sh autoconf )
 
-  _conf=(
+  local _conf=(
     --prefix=/usr
     --sysconfdir=/etc
     --libexecdir=/usr/lib

scripts/build-artifacts.bash

@@ -11,7 +11,9 @@ cp "$GITHUB_WORKSPACE"/assets/PKGBUILD PKGBUILD
 chown -R "$USR":"$USR" emacs
 
 # Create artifacts
-su "$USR" -c "makepkg"
+MAKEFLAGS="-j$(nproc)"
+export MAKEFLAGS
+su-exec "$USR" makepkg
 
 # Unpack artifacts
 mkdir out

scripts/docker-build.bash

@@ -8,4 +8,5 @@ DOCKER_BUILDKIT=1 docker build \
     --build-arg UPSTREAM_REPO="$UPSTREAM_REPO" \
     --build-arg USR="$USR" \
     --build-arg USR_HOME="$USR_HOME" \
+    --progress plain \
     .