diff --git a/.forgejo/workflows/android-release-metadata.yaml b/.forgejo/workflows/android-release-metadata.yaml index 6fbeb16d4..460cade7b 100644 --- a/.forgejo/workflows/android-release-metadata.yaml +++ b/.forgejo/workflows/android-release-metadata.yaml @@ -12,19 +12,12 @@ jobs: environment: production steps: - name: Checkout sources + # TODO: use shallow (and sparse?) checkout uses: actions/checkout@v4 - - name: Parallel submodules checkout - shell: bash - run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20)) - - - name: Checkout screenshots - uses: actions/checkout@v4 - with: - repository: ${{ secrets.SCREENSHOTS_REPO }} - ssh-key: ${{ secrets.SCREENSHOTS_SSH_KEY }} - ref: main - path: screenshots +# - name: Parallel submodules checkout +# shell: bash +# run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20)) - name: Restore release keys shell: bash @@ -37,6 +30,6 @@ jobs: - name: Upload shell: bash - run: ./gradlew prepareGoogleReleaseListing publishGoogleReleaseListing + run: ./gradlew publishGoogleReleaseListing working-directory: android timeout-minutes: 5 diff --git a/android/app/build.gradle b/android/app/build.gradle index 7311ac492..a0d8780ed 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -372,32 +372,6 @@ android.applicationVariants.all { variant -> variant.resValue 'string', 'app_id', variant.applicationId } -task prepareGoogleReleaseListing { - // Prepares Google Play metainfo from F-Droid metainfo. - final sourceFlavor = 'fdroid' - final targetFlavor = 'google' - doLast { - final sourceDir = new File("${projectDir}/src/$sourceFlavor/play/listings") - final targetDir = new File("${projectDir}/src/$targetFlavor/play/listings") - final sourceFiles = fileTree(dir: sourceDir, - include: '**/*.txt', exclude: "**/*-${targetFlavor}.txt") - sourceFiles.each { File sourceFile -> - final locale = sourceFile.parentFile.getName() - final targetLocaleDir = new File(targetDir, locale) - if (!targetLocaleDir.isDirectory()) - targetLocaleDir.mkdirs() - final targetFile = new File(targetLocaleDir, sourceFile.getName()) - // Override Google-specific values by using ${name}-google.txt files. - final overrideFile = new File(sourceFile.getPath().replace('.txt', "-${targetFlavor}.txt")) - targetFile.text = overrideFile.exists() ? overrideFile.text : sourceFile.text - } - copy { - from "${projectDir}/../../screenshots/android" - into targetDir - } - } -} - play { enabled.set(false) track.set('production')