From 27afc15281e54679b1fdddafd090ece6c4f16169 Mon Sep 17 00:00:00 2001 From: Leonardo Colman Lopes Date: Sat, 17 Aug 2024 21:46:00 -0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=B7=20Update=20Gradle=20action=20argum?= =?UTF-8?q?ents=20for=20APK=20assembly?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replaced various "package" commands with corresponding "assemble" commands across workflows for Fdroid, Playstore, and Github builds. Should help or fix https://github.com/LeoColman/Petals/issues/675 Ref: https://gitlab.com/IzzyOnDroid/repo/-/issues/593 Signed-off-by: Leonardo Colman Lopes --- .github/workflows/build-debug.main.kts | 6 +++--- .github/workflows/build-debug.yaml | 6 +++--- .github/workflows/build-release.main.kts | 6 +++--- .github/workflows/build-release.yaml | 6 +++--- .github/workflows/release.main.kts | 4 ++-- .github/workflows/release.yaml | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build-debug.main.kts b/.github/workflows/build-debug.main.kts index 98f12e75..276ec923 100755 --- a/.github/workflows/build-debug.main.kts +++ b/.github/workflows/build-debug.main.kts @@ -25,8 +25,8 @@ workflow( job(id = "build", runsOn = RunnerType.UbuntuLatest) { uses(name = "Set up JDK", action = SetupJava(javaVersion = "17", distribution = SetupJava.Distribution.Adopt)) uses(action = Checkout()) - uses(name = "Create Fdroid APK", action = GradleBuildAction(arguments = "packageFdroidDebugUniversalApk")) - uses(name = "Create Playstore APK", action = GradleBuildAction(arguments = "packagePlaystoreDebugUniversalApk")) - uses(name = "Create Github APK", action = GradleBuildAction(arguments = "packageGithubDebugUniversalApk")) + uses(name = "Create Fdroid APK", action = GradleBuildAction(arguments = "assembleFdroidDebug")) + uses(name = "Create Playstore APK", action = GradleBuildAction(arguments = "assemblePlaystoreDebug")) + uses(name = "Create Github APK", action = GradleBuildAction(arguments = "assembleGithubDebug")) } } diff --git a/.github/workflows/build-debug.yaml b/.github/workflows/build-debug.yaml index 6b0de381..ac04917e 100644 --- a/.github/workflows/build-debug.yaml +++ b/.github/workflows/build-debug.yaml @@ -37,14 +37,14 @@ jobs: name: 'Create Fdroid APK' uses: 'gradle/gradle-build-action@v3' with: - arguments: 'packageFdroidDebugUniversalApk' + arguments: 'assembleFdroidDebug' - id: 'step-3' name: 'Create Playstore APK' uses: 'gradle/gradle-build-action@v3' with: - arguments: 'packagePlaystoreDebugUniversalApk' + arguments: 'assemblePlaystoreDebug' - id: 'step-4' name: 'Create Github APK' uses: 'gradle/gradle-build-action@v3' with: - arguments: 'packageGithubDebugUniversalApk' + arguments: 'assembleGithubDebug' diff --git a/.github/workflows/build-release.main.kts b/.github/workflows/build-release.main.kts index 5269d252..6c3b38fc 100755 --- a/.github/workflows/build-release.main.kts +++ b/.github/workflows/build-release.main.kts @@ -31,8 +31,8 @@ workflow( uses(name = "Set up JDK", action = SetupJava(javaVersion = "17", distribution = SetupJava.Distribution.Adopt)) uses(action = Checkout()) uses(name = "reveal-secrets", action = GitSecretAction(gpgPrivateKey = expr { GPG_KEY })) - uses(name = "Create Fdroid APK", action = GradleBuildAction(arguments = "packageFdroidReleaseUniversalApk")) - uses(name = "Create Playstore APK", action = GradleBuildAction(arguments = "packagePlaystoreReleaseUniversalApk")) - uses(name = "Create Github APK", action = GradleBuildAction(arguments = "packageGithubReleaseUniversalApk")) + uses(name = "Create Fdroid APK", action = GradleBuildAction(arguments = "assembleFdroidRelease")) + uses(name = "Create Playstore APK", action = GradleBuildAction(arguments = "assemblePlaystoreRelease")) + uses(name = "Create Github APK", action = GradleBuildAction(arguments = "assembleGithubRelease")) } } diff --git a/.github/workflows/build-release.yaml b/.github/workflows/build-release.yaml index a4e60e5d..dd52e019 100644 --- a/.github/workflows/build-release.yaml +++ b/.github/workflows/build-release.yaml @@ -43,14 +43,14 @@ jobs: name: 'Create Fdroid APK' uses: 'gradle/gradle-build-action@v3' with: - arguments: 'packageFdroidReleaseUniversalApk' + arguments: 'assembleFdroidRelease' - id: 'step-4' name: 'Create Playstore APK' uses: 'gradle/gradle-build-action@v3' with: - arguments: 'packagePlaystoreReleaseUniversalApk' + arguments: 'assemblePlaystoreRelease' - id: 'step-5' name: 'Create Github APK' uses: 'gradle/gradle-build-action@v3' with: - arguments: 'packageGithubReleaseUniversalApk' + arguments: 'assembleGithubRelease' diff --git a/.github/workflows/release.main.kts b/.github/workflows/release.main.kts index f049e99d..c674045c 100755 --- a/.github/workflows/release.main.kts +++ b/.github/workflows/release.main.kts @@ -36,7 +36,7 @@ workflow( uses(action = Checkout()) uses(name = "reveal-secrets", action = GitSecretAction(gpgPrivateKey = expr { GPG_KEY })) - uses(name = "Create APK", action = GradleBuildAction(arguments = "packageGithubReleaseUniversalApk")) + uses(name = "Create APK", action = GradleBuildAction(arguments = "assembleGithubRelease")) uses( name = "Create release", action = ActionGhRelease( @@ -44,7 +44,7 @@ workflow( name = "Version " + expr { GITHUB_REF_NAME }, draft = true, files = listOf( - "app/build/outputs/apk_from_bundle/githubRelease/app-github-release-universal.apk", + "app/build/outputs/apk/github/release/app-github-release.apk", "app/build/outputs/mapping/githubRelease/mapping.txt", "app/build/outputs/mapping/githubRelease/configuration.txt", "app/build/outputs/mapping/githubRelease/seeds.txt", diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 51540d51..623ad8e6 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -43,7 +43,7 @@ jobs: name: 'Create APK' uses: 'gradle/gradle-build-action@v3' with: - arguments: 'packageGithubReleaseUniversalApk' + arguments: 'assembleGithubRelease' - id: 'step-4' name: 'Create release' uses: 'softprops/action-gh-release@v2' @@ -52,7 +52,7 @@ jobs: tag_name: '${{ github.GITHUB_REF_NAME }}' draft: 'true' files: |- - app/build/outputs/apk_from_bundle/githubRelease/app-github-release-universal.apk + app/build/outputs/apk/github/release/app-github-release.apk app/build/outputs/mapping/githubRelease/mapping.txt app/build/outputs/mapping/githubRelease/configuration.txt app/build/outputs/mapping/githubRelease/seeds.txt