From 50edb5ff75f942a641c19c676ec9f8ebb0870376 Mon Sep 17 00:00:00 2001 From: vjrj Date: Sun, 19 Jul 2026 09:54:31 +0200 Subject: [PATCH] ci(release): vendor fdroid config+srclibs in-repo (no gitlab clone); v0.1.8 (+10) --- .forgejo/workflows/release.yml | 8 ++- apps/app_seeds/pubspec.yaml | 2 +- docs/fdroid/org.comunes.tane.yml | 22 +++--- fdroid-ci/config.yml | 89 +++++++++++++++++++++++++ fdroid-ci/srclibs/flutter.yml | 2 + fdroid-ci/srclibs/tesseract4android.yml | 2 + 6 files changed, 111 insertions(+), 14 deletions(-) create mode 100644 fdroid-ci/config.yml create mode 100644 fdroid-ci/srclibs/flutter.yml create mode 100644 fdroid-ci/srclibs/tesseract4android.yml diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml index e779d52..4d78872 100644 --- a/.forgejo/workflows/release.yml +++ b/.forgejo/workflows/release.yml @@ -131,9 +131,13 @@ jobs: base=$(sed -n -E 's/^version:.*\+([0-9]+)$/\1/p' apps/app_seeds/pubspec.yaml) [ -n "$base" ] - # 4) fdroiddata skeleton (config.yml + srclibs) from the fork; overlay our recipe. + # 4) Assemble a minimal fdroiddata (config.yml + srclibs + our recipe) from the + # in-repo files. No external host needed — the job container reaches + # git.comunes.org (via forgejo:3000) but not gitlab.com. fdd=/tmp/fdroiddata - git clone --depth 1 -b tane https://gitlab.com/vjrj/fdroiddata.git "$fdd" + mkdir -p "$fdd/metadata" "$fdd/srclibs" + cp "$work/fdroid-ci/config.yml" "$fdd/config.yml" + cp "$work"/fdroid-ci/srclibs/*.yml "$fdd/srclibs/" cp "$work/docs/fdroid/org.comunes.tane.yml" "$fdd/metadata/org.comunes.tane.yml" cd "$fdd" # Build THIS commit; drop binary: (we PRODUCE the reference here, not verify it). diff --git a/apps/app_seeds/pubspec.yaml b/apps/app_seeds/pubspec.yaml index 5b225f2..ffd7a1e 100644 --- a/apps/app_seeds/pubspec.yaml +++ b/apps/app_seeds/pubspec.yaml @@ -1,7 +1,7 @@ name: tane description: "Tane — local-first, encrypted, decentralized traditional-seed inventory and market." publish_to: 'none' -version: 0.1.7+9 +version: 0.1.8+10 environment: sdk: ^3.11.5 diff --git a/docs/fdroid/org.comunes.tane.yml b/docs/fdroid/org.comunes.tane.yml index df61b9d..0514508 100644 --- a/docs/fdroid/org.comunes.tane.yml +++ b/docs/fdroid/org.comunes.tane.yml @@ -22,9 +22,9 @@ Repo: https://git.comunes.org/comunes/tane.git AllowedAPKSigningKeys: ddfae432091b8248a8a4a1b353487fa626301f4357ef835e94ec312f69418e38 Builds: - - versionName: 0.1.7 - versionCode: 91 - commit: v0.1.7 + - versionName: 0.1.8 + versionCode: 101 + commit: v0.1.8 subdir: apps/app_seeds output: build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk binary: https://git.comunes.org/comunes/tane/releases/download/v%v/app-armeabi-v7a-release.apk @@ -55,9 +55,9 @@ Builds: $PUB_CACHE/hosted/pub.dev/flutter_tesseract_ocr-0.4.31/android/libs/tesseract4android-release.aar - $$flutter$$/bin/flutter build apk --release --split-per-abi --target-platform=android-arm - - versionName: 0.1.7 - versionCode: 92 - commit: v0.1.7 + - versionName: 0.1.8 + versionCode: 102 + commit: v0.1.8 subdir: apps/app_seeds output: build/app/outputs/flutter-apk/app-arm64-v8a-release.apk binary: https://git.comunes.org/comunes/tane/releases/download/v%v/app-arm64-v8a-release.apk @@ -88,9 +88,9 @@ Builds: $PUB_CACHE/hosted/pub.dev/flutter_tesseract_ocr-0.4.31/android/libs/tesseract4android-release.aar - $$flutter$$/bin/flutter build apk --release --split-per-abi --target-platform=android-arm64 - - versionName: 0.1.7 - versionCode: 93 - commit: v0.1.7 + - versionName: 0.1.8 + versionCode: 103 + commit: v0.1.8 subdir: apps/app_seeds output: build/app/outputs/flutter-apk/app-x86_64-release.apk binary: https://git.comunes.org/comunes/tane/releases/download/v%v/app-x86_64-release.apk @@ -129,5 +129,5 @@ VercodeOperation: - '%c * 10 + 3' UpdateCheckData: apps/app_seeds/pubspec.yaml|version:\s*[\d.]+\+(\d+)|apps/app_seeds/pubspec.yaml|version:\s*([\d.]+)\+ -CurrentVersion: 0.1.7 -CurrentVersionCode: 93 +CurrentVersion: 0.1.8 +CurrentVersionCode: 103 diff --git a/fdroid-ci/config.yml b/fdroid-ci/config.yml new file mode 100644 index 0000000..0f104e1 --- /dev/null +++ b/fdroid-ci/config.yml @@ -0,0 +1,89 @@ +--- + +repo_url: "https://f-droid.org/repo" +repo_maxage: 14 +repo_web_base_url: "https://f-droid.org/packages" + +# needed until this is fixed: https://gitlab.com/fdroid/fdroidserver/-/issues/1143 +repo_name: "F-Droid" + +archive_older: 3 + +repo_keyalias: ciarang +repo_key_sha256: 43238d512c1e5eb2d6569f4a3afbf5523418b82e0a3ed1552770abb9a9c9ccab +repo_pubkey: 3082035e30820246a00302010202044c49cd00300d06092a864886f70d01010505003071310b300906035504061302554b3110300e06035504081307556e6b6e6f776e3111300f0603550407130857657468657262793110300e060355040a1307556e6b6e6f776e3110300e060355040b1307556e6b6e6f776e311930170603550403131043696172616e2047756c746e69656b73301e170d3130303732333137313032345a170d3337313230383137313032345a3071310b300906035504061302554b3110300e06035504081307556e6b6e6f776e3111300f0603550407130857657468657262793110300e060355040a1307556e6b6e6f776e3110300e060355040b1307556e6b6e6f776e311930170603550403131043696172616e2047756c746e69656b7330820122300d06092a864886f70d01010105000382010f003082010a028201010096d075e47c014e7822c89fd67f795d23203e2a8843f53ba4e6b1bf5f2fd0e225938267cfcae7fbf4fe596346afbaf4070fdb91f66fbcdf2348a3d92430502824f80517b156fab00809bdc8e631bfa9afd42d9045ab5fd6d28d9e140afc1300917b19b7c6c4df4a494cf1f7cb4a63c80d734265d735af9e4f09455f427aa65a53563f87b336ca2c19d244fcbba617ba0b19e56ed34afe0b253ab91e2fdb1271f1b9e3c3232027ed8862a112f0706e234cf236914b939bcf959821ecb2a6c18057e070de3428046d94b175e1d89bd795e535499a091f5bc65a79d539a8d43891ec504058acb28c08393b5718b57600a211e803f4a634e5c57f25b9b8c4422c6fd90203010001300d06092a864886f70d0101050500038201010008e4ef699e9807677ff56753da73efb2390d5ae2c17e4db691d5df7a7b60fc071ae509c5414be7d5da74df2811e83d3668c4a0b1abc84b9fa7d96b4cdf30bba68517ad2a93e233b042972ac0553a4801c9ebe07bf57ebe9a3b3d6d663965260e50f3b8f46db0531761e60340a2bddc3426098397fda54044a17e5244549f9869b460ca5e6e216b6f6a2db0580b480ca2afe6ec6b46eedacfa4aa45038809ece0c5978653d6c85f678e7f5a2156d1bedd8117751e64a4b0dcd140f3040b021821a8d93aed8d01ba36db6c82372211fed714d9a32607038cdfd565bd529ffc637212aaa2c224ef22b603eccefb5bf1e085c191d4b24fe742b17ab3f55d4e6f05ef + +gpgkey: 37D2C98789D8311948394E3E41E7044E1DBA2E89 +gpghome: {env: gpghome} + +keystore: {env: keystore} +keydname: "CN=FDroid, OU=FDroid, O=fdroid.org, L=ORG, S=ORG, C=UK" +keystorepass: {env: keystorepass} +keypass: {env: keypass} + +serverwebroot: {env: serverwebroot} +nonstandardwebroot: true + +deploy_process_logs: true +keep_when_not_allowed: true +make_current_version_link: false +refresh_scanner: true + +binary_transparency_remote: git@gitlab.com:fdroid/f-droid.org-transparency-log.git + +keyaliases: + com.ghostsq.commander.samba: '@com.ghostsq.commander' + com.nextcloud.talk2: '@com.nextcloud.client' + com.termux.api: '@com.termux' + com.termux.boot: '@com.termux' + com.termux.gui: '@com.termux' + com.termux.styling: '@com.termux' + com.termux.tasker: '@com.termux' + com.termux.widget: '@com.termux' + com.termux.window: '@com.termux' + org.fdroid.fdroid.privileged: 'ciarang' + org.fdroid.fdroid: 'ciarang' + +# APKs signed by publicly available private signing keys are not +# allowed to be included in this repo, even if they are reproducible. +# +# Hash calculated with `openssl x509 -in -outform der | sha256sum` +apk_signing_key_block_list: + # https://android.googlesource.com/platform/build/+/refs/heads/main/target/product/security + - a6ccc500ff0e7421200eb66a7fe174ef1b00e52ca91727070cbedf061ff76c35 # AOSP bluetooth.x509.pem + - ce7b2b47ae2b7552c8f92cc29124279883041fb623a5f194a82c9bf15d492aa0 # AOSP cts_uicc_2021.x509.pem + - 465983f7791f2abeb43ea2cbdc7f21a8260b72bc08a55c839fc1a43bc741a81e # AOSP media.x509.pem + - e1dbadce60dc080d15b58a014b0dcf9400e24de23fa00b287a5a982bfebda2ee # AOSP networkstack.x509.pem + - fae9122a8721d6e2a196d2224dffcf773c9127e2bb956cbddb40b009192ffdfd # AOSP nfc.x509.pem + - c8a2e9bccf597c2fb6dc66bee293fc13f2fc47ec77bc6b2b0d52c11f51192ab8 # AOSP platform.x509.pem + - abf21f9e2af1d881cc673fddcefa6ed9c269a437bd64b279cf45844cfd589126 # AOSP sdk_sandbox.x509.pem + - 28bbfe4a7b97e74681dc55c2fbb6ccb8d6c74963733f6af6ae74d8c3a6e879fd # AOSP shared.x509.pem + - a40da80a59d170caa950cf15c18c454d47a39b26989d8b640ecd745ba71bf5dc # AOSP testkey.x509.pem + # Leaked Platform Certificates https://bugs.chromium.org/p/apvi/issues/detail?id=100 + - 2464ddfefa071f268ea7667123df05ead2293272ff2a64d9cee021c38b46c6af + - 2bfa22964760a25d99ab9a14910e44fe2063b51d5b4ac2e4282573ce94996aa3 + - 34df0e7a9f1cf1892e45c056b4973cd81ccf148a4050d11aea4ac5a65f900a42 + - 369c38b18401ea16785f11720e37d7a2bc5a4d209e76955c0858ea469ad62fdf + - 4274243d7a954ac6482866f0cc67ca1843ca94d68a0ee53f837d6740a8134421 + - 5304915c4bb7baca28776231993996fde1baffcbbe6500fb0fc7f2d3a2888cb7 + - 9200c550f2374706eff37e3a8674bc03aeba8b25c052de638972ab94365af0a2 + - 9fc510e167d8d312e758273285414e77edac9fed944741f5682be92501f095d4 + - a7a0e10a61a5af93624376df60e9def9436358f50aa6174e5423633b856e2be1 + - b01dcea669eefdd991fc6a24678a8b6e6a6d0ad8986950328c69d0eea1dec0d5 + # publicly available in https://github.com/esabook/auzen-android + - 30d7eef6321f81f43c008665abc46f680006be6e89961481ed4e1d6981b8e5a0 + # publicly available in https://github.com/Goooler/LawnchairRelease + - 8f5b1353db08cd9287f8ecc6bad2eb9be2668d476af90415bd7bfdff257840e4 + # publicly available in https://github.com/jkas-dbt/AndroidPE + - f1881e27ceb9b4341a0fc00db27bf5f46a38e4c0c1884353f76b0fe4b0e4dccf + # publicly available in https://github.com/iebb/NekokoLPA + - 6966004ad0161165335f9204f8f5a52df49fe068c9545c0c589c23221af8d3a4 + - 4139278AACCE8338C03DC9A6B0172C1880E0A4949FF3E05292C2E781765026FA + # publicly available in https://github.com/MaYiFei1995/PackageViewer + - 24117de73612bcfeaf2a6a24bd044f2e33e52d41965f504d74177f4fe255eb26 + # publicly available in https://github.com/teambtcmap/btcmap-android + - 37cdf8e8fdff2252681c1f7d68f3850f916f05607442c6762f86f6a23a7c1ad0 + # publicly available in https://github.com/Ashinch/ReadYou/blob/0.11.1/signature/keystore.properties + - 715696914a35366d98fa45312af96811f7e6de4085b5e4709f4c1e74f8bde4d0 + # Privacy QR Scanner leaked key + - 2529f2fd61ac279806b7bc423daef5b36fdac496c87ff9fa36c8bdeead12acaa diff --git a/fdroid-ci/srclibs/flutter.yml b/fdroid-ci/srclibs/flutter.yml new file mode 100644 index 0000000..2a3d516 --- /dev/null +++ b/fdroid-ci/srclibs/flutter.yml @@ -0,0 +1,2 @@ +RepoType: git +Repo: https://github.com/flutter/flutter.git diff --git a/fdroid-ci/srclibs/tesseract4android.yml b/fdroid-ci/srclibs/tesseract4android.yml new file mode 100644 index 0000000..6f59415 --- /dev/null +++ b/fdroid-ci/srclibs/tesseract4android.yml @@ -0,0 +1,2 @@ +RepoType: git +Repo: https://github.com/adaptech-cz/Tesseract4Android