From ca20e0cabd5dcb4d19ac79f35c90d822e472f116 Mon Sep 17 00:00:00 2001 From: Rocka Date: Fri, 11 Jul 2025 00:29:53 +0800 Subject: [PATCH 1/3] Try install gettext from trixie --- app/org.fcitx.fcitx5.android.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/org.fcitx.fcitx5.android.yml b/app/org.fcitx.fcitx5.android.yml index 7c2ffc2eb..161859ecd 100644 --- a/app/org.fcitx.fcitx5.android.yml +++ b/app/org.fcitx.fcitx5.android.yml @@ -19,11 +19,14 @@ Builds: subdir: app submodules: true sudo: + - sed -ne '0,/^[^#]/ s/bookworm/trixie/ p' /etc/apt/sources.list > /etc/apt/sources.list.d/trixie.list + - echo 'APT::Default-Release "stable";' > /etc/apt/apt.conf.d/99default-stable - apt-get update - apt-get install -y g++ libtool make automake gettext bzip2 xz-utils zstd pkg-config cmake extra-cmake-modules ninja-build libfmt-dev libsystemd-dev libboost-all-dev ghc cabal-install libghc-shake-dev libghc-aeson-pretty-dev libghc-js-flot-data haskell-js-dgtable-utils python-is-python3 opencc + - apt-get install -t trixie gradle: - yes binary: https://jenkins.fcitx-im.org/job/android/job/fcitx5-android/lastSuccessfulBuild/artifact/out/org.fcitx.fcitx5.android-%v-%abi-release.apk From 0962a4a9232785879e3dc3daa3b7deb717e5f196 Mon Sep 17 00:00:00 2001 From: Rocka Date: Fri, 11 Jul 2025 00:37:14 +0800 Subject: [PATCH 2/3] fixup --- app/org.fcitx.fcitx5.android.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/org.fcitx.fcitx5.android.yml b/app/org.fcitx.fcitx5.android.yml index 161859ecd..66a8a168c 100644 --- a/app/org.fcitx.fcitx5.android.yml +++ b/app/org.fcitx.fcitx5.android.yml @@ -19,14 +19,15 @@ Builds: subdir: app submodules: true sudo: - - sed -ne '0,/^[^#]/ s/bookworm/trixie/ p' /etc/apt/sources.list > /etc/apt/sources.list.d/trixie.list - - echo 'APT::Default-Release "stable";' > /etc/apt/apt.conf.d/99default-stable - apt-get update - apt-get install -y g++ libtool make automake gettext bzip2 xz-utils zstd pkg-config cmake extra-cmake-modules ninja-build libfmt-dev libsystemd-dev libboost-all-dev ghc cabal-install libghc-shake-dev libghc-aeson-pretty-dev libghc-js-flot-data haskell-js-dgtable-utils python-is-python3 opencc - - apt-get install -t trixie + - sed -ne '0,/^[^#]/ s/bookworm/trixie/ p' /etc/apt/sources.list > /etc/apt/sources.list.d/trixie.list + - echo 'APT::Default-Release "stable";' > /etc/apt/apt.conf.d/99default-stable + - apt-get update + - apt-get install -t trixie gettext gradle: - yes binary: https://jenkins.fcitx-im.org/job/android/job/fcitx5-android/lastSuccessfulBuild/artifact/out/org.fcitx.fcitx5.android-%v-%abi-release.apk From 86038097d170cbc1a9beaef8d9a8c28164adc6a1 Mon Sep 17 00:00:00 2001 From: Rocka Date: Fri, 11 Jul 2025 00:56:38 +0800 Subject: [PATCH 3/3] fixup commit hash in workflow --- .github/workflows/fdroid.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/fdroid.yml b/.github/workflows/fdroid.yml index c2c449d2c..8d612b32e 100644 --- a/.github/workflows/fdroid.yml +++ b/.github/workflows/fdroid.yml @@ -90,11 +90,6 @@ jobs: (.versionCode = $versionCode) |= (.commit = \"$commitHash\") " $metadata - # TODO: remove this afterwards - # https://github.com/orgs/community/discussions/26676 - yq -i ".Builds[0] |= - (.commit = \"${{ github.event.pull_request.head.sha }}\") - " $metadata prebuiltTreeURL=$(curl -L \ -H "Accept: application/vnd.github+json" \ -H "Authorization: Bearer ${{ github.token }}" \