ci: pandoc dep

Author: psadi

.github/workflows/ci.yaml

@@ -38,9 +38,7 @@ jobs:
         with:
           path: |
             /tmp/offline-cache
-            /usr/local/bin/appimagetool
-            /usr/local/bin/minisign
-            /usr/local/bin/zig
+            /usr/local/bin
             /opt
           key: ${{ runner.os }}-${{ matrix.arch }}-ghostty-${{ hashFiles('**/setup.sh') }}
           restore-keys: |

build.sh

@@ -5,17 +5,6 @@ set -e
 export ARCH="$(uname -m)"
 
 GHOSTTY_VERSION="1.1.0"
-
-# Detect latest version numbers when jq is available.
-if command -v jq >/dev/null 2>&1; then
-	if [ "$1" = "latest" ]; then
-		GHOSTTY_VERSION="$(
-			curl -s https://api.github.com/repos/ghostty-org/ghostty/tags |
-				jq '[.[] | select(.name != "tip") | .name | ltrimstr("v")] | sort_by(split(".") | map(tonumber)) | last'
-		)"
-	fi
-fi
-
 TMP_DIR="/tmp/ghostty-build"
 APP_DIR="${TMP_DIR}/ghostty.AppDir"
 PUB_KEY="RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV"

setup.sh

@@ -1,36 +1,42 @@
 #!/bin/sh
 
-install_pandoc() {
-	git clone https://aur.archlinux.org/pandoc.git
-	cd pandoc || {
-		echo "Failed to enter pandoc directory"
-		return 1
-	}
-	makepkg -si --noconfirm
-	cd ..
-	rm -rf pandoc
-	echo "Pandoc installed"
-}
-
 set -e
 
 export ARCH="$(uname -m)"
 
 ZIG_VERSION="0.13.0"
-MINISIGN_URL="https://github.com/jedisct1/minisign/releases/download/0.11/minisign-0.11-linux.tar.gz"
+PANDOC_VERSION="3.6.3"
+MINISIGN_VERSION="0.11"
+
+PANDOC_BASE="https://github.com/jgm/pandoc/releases/download/${PANDOC_VERSION}"
+MINISIGN_URL="https://github.com/jedisct1/minisign/releases/download/${MINISIGN_VERSION}/minisign-${MINISIGN_VERSION}-linux.tar.gz"
+APPIMAGE_URL="https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-${ARCH}.AppImage"
+ZIG_URL="https://ziglang.org/download/${ZIG_VERSION}/zig-linux-${ARCH}-${ZIG_VERSION}.tar.xz"
+
+case "${ARCH}" in
+"x86_64")
+	PANDOC_URL="${PANDOC_BASE}/pandoc-${PANDOC_VERSION}-linux-amd64.tar.gz"
+	;;
+"aarch64")
+	PANDOC_URL="${PANDOC_BASE}/pandoc-${PANDOC_VERSION}-linux-arm64.tar.gz"
+	;;
+*)
+	echo "Unsupported ARCH: '${ARCH}'"
+	exit 1
+	;;
+esac
 
 # Update & install OS base dependencies
 buildPkgs="base-devel freetype2 oniguruma wget fuse file zsync appstream"
 ghosttyPkgs="gtk4 libadwaita"
 pacman -Syu --noconfirm
 # pacman -Syw --noconfirm ${buildPkgs} ${ghosttyPkgs}
 pacman -Syq --needed --noconfirm ${buildPkgs} ${ghosttyPkgs}
-install_pandoc
 
 # Download & install other dependencies
 # appimagetool: https://github.com/AppImage/appimagetool
 if [ ! -f '/usr/local/bin/appimagetool' ]; then
-	wget -q "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-${ARCH}.AppImage" -O /tmp/appimagetool.AppImage
+	wget -q "${APPIMAGE_URL}" -O /tmp/appimagetool.AppImage
 	chmod +x /tmp/appimagetool.AppImage
 	mv /tmp/appimagetool.AppImage /usr/local/bin/appimagetool
 fi
@@ -44,14 +50,21 @@ fi
 
 # zig: https://ziglang.org
 if [ ! -d "/opt/zig-linux-${ARCH}-${ZIG_VERSION}" ]; then
-	wget -q "https://ziglang.org/download/${ZIG_VERSION}/zig-linux-${ARCH}-${ZIG_VERSION}.tar.xz" -O /tmp/zig-linux.tar.xz
+	wget -q "${ZIG_URL}" -O /tmp/zig-linux.tar.xz
 	tar -xf /tmp/zig-linux.tar.xz -C /opt
 	ln -s "/opt/zig-linux-${ARCH}-${ZIG_VERSION}/zig" /usr/local/bin/zig
 fi
 
+# pandoc: https://github.com/jgm/pandoc
+if [ ! -f '/usr/local/bin/pandoc' ]; then
+	wget -q "${PANDOC_URL}" -O /tmp/pandoc-linux.tar.gz
+	tar -xzf pandoc-linux.tar.gz -C /tmp
+	mv "/tmp/pandoc-${PANDOC_VERSION}/bin/*" /usr/local/bin
+fi
+
 # Cleanup
 rm -rf \
 	/tmp/appimagetool.AppImage \
-	/tmp/minisign-linux.tar.gz \
-	/tmp/minisign-linux \
-	/tmp/zig-linux.tar.xz
+	/tmp/minisign-linux* \
+	/tmp/zig-linux.tar.xz \
+	/tmp/pandoc*