From 454cfcfc85d16ae2eb256802902b8ba335f2f48a Mon Sep 17 00:00:00 2001 From: Andrey Prokopyuk Date: Fri, 4 Sep 2026 12:36:30 +0300 Subject: [PATCH] Remove local F-Droid recipe mirror --- .fdroid.yml | 133 -------------------------- .github/workflows/fdroid-recipe.yml | 44 --------- scripts/build-release-apks.sh | 2 +- scripts/check-fdroid-metadata-sync.sh | 41 -------- 4 files changed, 1 insertion(+), 219 deletions(-) delete mode 100644 .fdroid.yml delete mode 100644 .github/workflows/fdroid-recipe.yml delete mode 100755 scripts/check-fdroid-metadata-sync.sh diff --git a/.fdroid.yml b/.fdroid.yml deleted file mode 100644 index e6bd0b6..0000000 --- a/.fdroid.yml +++ /dev/null @@ -1,133 +0,0 @@ -Categories: - - VPN & Proxy -License: MIT -AuthorName: Andrey Prokopyuk -AuthorWebSite: https://github.com/andre487 -SourceCode: https://github.com/andre487/AndroidMegaProxy -IssueTracker: https://github.com/andre487/AndroidMegaProxy/issues -Changelog: https://github.com/andre487/AndroidMegaProxy/releases -AllowedAPKSigningKeys: 8a014a2a558a75b5f900ee0c33cd50f24b7432734912406699fc08866747f822 - -RepoType: git -Repo: https://github.com/andre487/AndroidMegaProxy.git - -Builds: - - versionName: 0.0.11 - versionCode: 11001 - commit: v0.0.11 - subdir: app - ndk: 29.0.14206865 - sudo: - - apt-get update - - apt-get install -t trixie-backports -y golang-go - - apt-get install -y gcc libc-dev make openjdk-21-jdk-headless - gradle: - - yes - gradleprops: - - megaproxyVersionVariant=armeabi-v7a - srclibs: - - go@go1.26.3 - binary: https://github.com/andre487/AndroidMegaProxy/releases/download/v%v/mega-proxy-armeabi-v7a.apk - prebuild: - - sdkmanager 'platforms;android-26' - build: - - pushd $$go$$/src - - ./make.bash - - popd - - export GOROOT=$$go$$ - - export GOPATH=$HOME/go - - export PATH=$GOROOT/bin:$GOPATH/bin:$PATH - - MEGAPROXY_ANDROID_ABI=armeabi-v7a ../scripts/build-fdroid-native.sh - - - versionName: 0.0.11 - versionCode: 11002 - commit: v0.0.11 - subdir: app - ndk: 29.0.14206865 - sudo: - - apt-get update - - apt-get install -t trixie-backports -y golang-go - - apt-get install -y gcc libc-dev make openjdk-21-jdk-headless - gradle: - - yes - gradleprops: - - megaproxyVersionVariant=arm64-v8a - srclibs: - - go@go1.26.3 - binary: https://github.com/andre487/AndroidMegaProxy/releases/download/v%v/mega-proxy-arm64-v8a.apk - prebuild: - - sdkmanager 'platforms;android-26' - build: - - pushd $$go$$/src - - ./make.bash - - popd - - export GOROOT=$$go$$ - - export GOPATH=$HOME/go - - export PATH=$GOROOT/bin:$GOPATH/bin:$PATH - - MEGAPROXY_ANDROID_ABI=arm64-v8a ../scripts/build-fdroid-native.sh - - - versionName: 0.0.11 - versionCode: 11003 - commit: v0.0.11 - subdir: app - ndk: 29.0.14206865 - sudo: - - apt-get update - - apt-get install -t trixie-backports -y golang-go - - apt-get install -y gcc libc-dev make openjdk-21-jdk-headless - gradle: - - yes - gradleprops: - - megaproxyVersionVariant=x86 - srclibs: - - go@go1.26.3 - binary: https://github.com/andre487/AndroidMegaProxy/releases/download/v%v/mega-proxy-x86.apk - prebuild: - - sdkmanager 'platforms;android-26' - build: - - pushd $$go$$/src - - ./make.bash - - popd - - export GOROOT=$$go$$ - - export GOPATH=$HOME/go - - export PATH=$GOROOT/bin:$GOPATH/bin:$PATH - - MEGAPROXY_ANDROID_ABI=x86 ../scripts/build-fdroid-native.sh - - - versionName: 0.0.11 - versionCode: 11004 - commit: v0.0.11 - subdir: app - ndk: 29.0.14206865 - sudo: - - apt-get update - - apt-get install -t trixie-backports -y golang-go - - apt-get install -y gcc libc-dev make openjdk-21-jdk-headless - gradle: - - yes - gradleprops: - - megaproxyVersionVariant=x86_64 - srclibs: - - go@go1.26.3 - binary: https://github.com/andre487/AndroidMegaProxy/releases/download/v%v/mega-proxy-x86_64.apk - prebuild: - - sdkmanager 'platforms;android-26' - build: - - pushd $$go$$/src - - ./make.bash - - popd - - export GOROOT=$$go$$ - - export GOPATH=$HOME/go - - export PATH=$GOROOT/bin:$GOPATH/bin:$PATH - - MEGAPROXY_ANDROID_ABI=x86_64 ../scripts/build-fdroid-native.sh - -VercodeOperation: - - 1000 * %c + 1 - - 1000 * %c + 2 - - 1000 * %c + 3 - - 1000 * %c + 4 - -AutoUpdateMode: Version -UpdateCheckMode: Tags -UpdateCheckData: app/build.gradle.kts|versionCodeBase = (\d+)|.|versionName = "([^"]+)" -CurrentVersion: 0.0.11 -CurrentVersionCode: 11004 diff --git a/.github/workflows/fdroid-recipe.yml b/.github/workflows/fdroid-recipe.yml deleted file mode 100644 index 5614cdb..0000000 --- a/.github/workflows/fdroid-recipe.yml +++ /dev/null @@ -1,44 +0,0 @@ -name: F-Droid recipe - -on: - push: - branches: - - main - paths: - - .fdroid.yml - - app/build.gradle.kts - - native/** - - scripts/build-fdroid-native.sh - - scripts/check-fdroid-metadata-sync.sh - - .github/workflows/fdroid-recipe.yml - schedule: - - cron: "17 6 * * 1" - workflow_dispatch: - -permissions: - contents: read - -concurrency: - group: fdroid-recipe-${{ github.ref }} - cancel-in-progress: true - -jobs: - metadata-sync: - name: Check fdroiddata synchronization - runs-on: ubuntu-latest - timeout-minutes: 10 - steps: - - name: Check out repository - uses: actions/checkout@v6 - - - name: Compare the recipe with fdroiddata - env: - EVENT_NAME: ${{ github.event_name }} - run: | - if ./scripts/check-fdroid-metadata-sync.sh; then - exit 0 - fi - echo "::warning title=F-Droid recipe is out of sync::Update the fdroiddata merge request after publishing the release." - if [[ "$EVENT_NAME" != "push" ]]; then - exit 1 - fi diff --git a/scripts/build-release-apks.sh b/scripts/build-release-apks.sh index 665135c..ea1a307 100755 --- a/scripts/build-release-apks.sh +++ b/scripts/build-release-apks.sh @@ -206,7 +206,7 @@ done # F-Droid verifies this universal APK against a clean source build before # publishing it with the upstream signature. Keep its gomobile and Gradle -# inputs identical to the F-Droid recipe in .fdroid.yml. +# inputs compatible with the recipe maintained in fdroiddata. echo "Building optimized native AAR for the universal APK" ( cd "$project_dir/native" diff --git a/scripts/check-fdroid-metadata-sync.sh b/scripts/check-fdroid-metadata-sync.sh deleted file mode 100755 index 5cc68ff..0000000 --- a/scripts/check-fdroid-metadata-sync.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -script_dir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)" -project_dir="$(cd -- "$script_dir/.." && pwd)" -local_metadata="$project_dir/.fdroid.yml" -temporary_metadata="$(mktemp)" -trap 'rm -f "$temporary_metadata"' EXIT - -upstream_url="https://gitlab.com/fdroid/fdroiddata/-/raw/master/metadata/net.megaproxy487.yml" -pending_url="https://gitlab.com/andre487/fdroiddata/-/raw/net.megaproxy487/metadata/net.megaproxy487.yml" - -if curl --fail --silent --show-error --location "$upstream_url" > "$temporary_metadata"; then - metadata_url="$upstream_url" -elif curl --fail --silent --show-error --location "$pending_url" > "$temporary_metadata"; then - metadata_url="$pending_url" -else - echo "Unable to download MegaProxy metadata from fdroiddata or its pending fork." >&2 - exit 1 -fi - -ruby -ryaml -e ' - keys = %w[ - AllowedAPKSigningKeys Builds AutoUpdateMode UpdateCheckMode - CurrentVersion CurrentVersionCode - ] - local = YAML.safe_load(File.read(ARGV[0]), permitted_classes: [], aliases: false) - remote = YAML.safe_load(File.read(ARGV[1]), permitted_classes: [], aliases: false) - local_recipe = local.select { |key, _| keys.include?(key) } - remote_recipe = remote.select { |key, _| keys.include?(key) } - exit 0 if local_recipe == remote_recipe - - warn "The F-Droid recipe is out of sync with #{ARGV[2]}." - warn "Update metadata/net.megaproxy487.yml in fdroiddata after merging the app change." - warn "Local recipe: #{local_recipe.inspect}" - warn "Remote recipe: #{remote_recipe.inspect}" - exit 1 -' "$local_metadata" "$temporary_metadata" "$metadata_url" - -echo "F-Droid metadata matches $metadata_url"