From cc911f95b8365038e3828dc602f201dbb51575f0 Mon Sep 17 00:00:00 2001 From: Ngo Quoc Dat Date: Fri, 16 Oct 2026 23:42:00 +0700 Subject: [PATCH] ci(linux): keep main's Linux workflow identical to the linux branch --- .github/workflows/build-linux.yml | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index 5a00770d71..42cb5423f9 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -369,11 +369,14 @@ jobs: if: needs.detect.outputs.linux == 'true' runs-on: ubuntu-24.04 timeout-minutes: 30 - # fedora:44 ships gettext 0.26; 0.24 is the first release whose - # xgettext reads Rust. An older one falls back to its C lexer and - # misreads lifetimes. + # ubuntu:26.10 ships gettext 1.0, the first release whose xgettext + # reads a call through a path such as crate::i18n::gettext. 0.24 to + # 0.26 read Rust but skip those calls, and an older one falls back to + # its C lexer. container: - image: fedora:44 + image: ubuntu:26.10 + env: + DEBIAN_FRONTEND: noninteractive defaults: run: working-directory: linux @@ -383,7 +386,8 @@ jobs: # read. - name: Install git run: | - dnf install -y --setopt=install_weak_deps=False git + apt-get update + apt-get install -y --no-install-recommends ca-certificates git git config --global --add safe.directory "$GITHUB_WORKSPACE" working-directory: / - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 @@ -391,11 +395,11 @@ jobs: persist-credentials: false - name: Install system dependencies run: | - dnf install -y --setopt=install_weak_deps=False \ - gcc pkgconf meson ninja-build gettext \ - desktop-file-utils appstream glib2-devel \ - gtk4-devel libadwaita-devel gtksourceview5-devel \ - sqlite-devel krb5-devel clang-devel cargo rust + apt-get install -y --no-install-recommends \ + build-essential pkgconf meson ninja-build gettext \ + desktop-file-utils appstream libglib2.0-bin libglib2.0-dev libxml2-utils \ + libgtk-4-dev libadwaita-1-dev libgtksourceview-5-dev \ + libsqlite3-dev libkrb5-dev clang libclang-dev cargo rustc - name: POTFILES.in is current run: | git ls-files 'crates/app/src/*.rs' 'data/resources/*.ui' 'data/*.desktop.in.in' \ @@ -410,7 +414,7 @@ jobs: run: | meson compile -C _build tablepro-pot if ! git diff --exit-code --ignore-matching-lines='^"POT-Creation-Date: ' -- po/tablepro.pot; then - echo "::error::po/tablepro.pot does not match the strings in the code: run meson compile -C _build tablepro-pot with gettext 0.24 or newer, or take the tablepro-pot artifact of this run, and commit it" + echo "::error::po/tablepro.pot does not match the strings in the code: run meson compile -C _build tablepro-pot with gettext 1.0 or newer, or take the tablepro-pot artifact of this run, and commit it" exit 1 fi - name: Keep the regenerated template