From 4c4e79e384cc8785b5d4af176186fa0c8a0033dd Mon Sep 17 00:00:00 2001 From: James Magahern Date: Mon, 8 Sep 2025 23:39:12 -0700 Subject: [PATCH] gitea workflow: try non ubuntu chrome --- .gitea/workflows/build-pdf.yml | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/.gitea/workflows/build-pdf.yml b/.gitea/workflows/build-pdf.yml index 3be91fb..4389792 100644 --- a/.gitea/workflows/build-pdf.yml +++ b/.gitea/workflows/build-pdf.yml @@ -21,22 +21,30 @@ jobs: check-latest: true cache: true - - name: Install Chromium and tools + - name: Install Chrome and tools (no snap) run: | set -euxo pipefail if command -v sudo >/dev/null 2>&1; then SUDO=sudo; else SUDO=; fi $SUDO apt-get update - # Prefer chromium if available via apt (Debian/Ubuntu variants); fall back to chromium-browser if needed - if apt-cache show chromium >/dev/null 2>&1; then - DEBIAN_FRONTEND=noninteractive $SUDO apt-get install -y --no-install-recommends \ - make chromium ca-certificates fonts-liberation - else - DEBIAN_FRONTEND=noninteractive $SUDO apt-get install -y --no-install-recommends \ - make chromium-browser ca-certificates fonts-liberation || true - fi + # Base tools and fonts + DEBIAN_FRONTEND=noninteractive $SUDO apt-get install -y --no-install-recommends \ + ca-certificates gnupg make fonts-liberation + + # Add Google's official Chrome APT repo (avoids Ubuntu's snap-only chromium) + $SUDO install -d -m 0755 /etc/apt/keyrings + curl -fsSL https://dl.google.com/linux/linux_signing_key.pub | $SUDO gpg --dearmor -o /etc/apt/keyrings/google-linux-signing-keyring.gpg + echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/google-linux-signing-keyring.gpg] https://dl.google.com/linux/chrome/deb/ stable main" | \ + $SUDO tee /etc/apt/sources.list.d/google-chrome.list >/dev/null + $SUDO apt-get update + DEBIAN_FRONTEND=noninteractive $SUDO apt-get install -y --no-install-recommends google-chrome-stable + + # Clean up apt lists to keep image lean $SUDO rm -rf /var/lib/apt/lists/* - name: Build PDF + env: + # Ensure our tools pick Chrome first if multiple are present + CHROME_PATH: /usr/bin/google-chrome-stable run: make pdf - name: Upload artifact