From c97611af80bc412ecf0d23f5f8381e6ca2b94e8a Mon Sep 17 00:00:00 2001 From: Kirill Ivanov Date: Tue, 29 Apr 2025 18:09:31 +0300 Subject: [PATCH 1/4] chore(github): prepare debug enveronment --- .github/workflows/publish.yaml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index e06952a..989ee16 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -2,16 +2,19 @@ name: Publish to Play Store on: pull_request: - types: - - closed - branches: - - master - workflow_dispatch: + # TODO + # types: + # - closed + # branches: + # - master + # workflow_dispatch: jobs: google-play-publish: - if: github.event_name == 'workflow_dispatch' || (github.event_name == 'pull_request' && github.event.pull_request.merged == true && startsWith(github.event.pull_request.head.ref, 'release/')) - uses: personaclick/workflow/.github/workflows/reusable-android-google-play-publish.yaml@1cfee7e2e762eed3a3d7d67c413aa0bae7f5ffae + # if: github.event_name == 'workflow_dispatch' || (github.event_name == 'pull_request' && github.event.pull_request.merged == true && startsWith(github.event.pull_request.head.ref, 'release/')) + # uses: personaclick/workflow/.github/workflows/reusable-android-google-play-publish.yaml@1cfee7e2e762eed3a3d7d67c413aa0bae7f5ffae + # TODO replacements + uses: personaclick/workflow/.github/workflows/reusable-android-google-play-publish.yaml@d6d23e924224f75a134a47b364002c48bf0c88da with: githubAppId: ${{ vars.PERSONACLICK_COURIER_ID }} packageName: "personaclick.demo_shop" From 6f51ef7585f1e2c3eb0269f37718fa55847fa992 Mon Sep 17 00:00:00 2001 From: Kirill Ivanov Date: Tue, 29 Apr 2025 18:50:19 +0300 Subject: [PATCH 2/4] fix(app): adapt application id to package name on google services json --- .github/workflows/publish.yaml | 2 +- app/build.gradle.kts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 989ee16..3e4af55 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -17,7 +17,7 @@ jobs: uses: personaclick/workflow/.github/workflows/reusable-android-google-play-publish.yaml@d6d23e924224f75a134a47b364002c48bf0c88da with: githubAppId: ${{ vars.PERSONACLICK_COURIER_ID }} - packageName: "personaclick.demo_shop" + packageName: "personaClick.demo_shop" aabReleasePath: "app/build/outputs/bundle/prodRelease/app-prod-release.aab" propertiesFilePath: "version.properties" secrets: diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 205fa11..faa8932 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -17,7 +17,7 @@ android { namespace = "personaclick.demo_android.app" defaultConfig { - applicationId = "personaclick.demo_shop" + applicationId = "personaClick.demo_shop" } } @@ -37,4 +37,4 @@ dependencies { implementation(project(":core")) implementation(project(":feature")) implementation(project(":navigation")) -} \ No newline at end of file +} From b4f6cd1b6ecff16e30e933e87337c31cf6eafdf8 Mon Sep 17 00:00:00 2001 From: Kirill Ivanov Date: Tue, 29 Apr 2025 19:01:22 +0300 Subject: [PATCH 3/4] chore(github): chnge publish workfolow branch to edge --- .github/workflows/publish.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 3e4af55..e0201b7 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -14,7 +14,9 @@ jobs: # if: github.event_name == 'workflow_dispatch' || (github.event_name == 'pull_request' && github.event.pull_request.merged == true && startsWith(github.event.pull_request.head.ref, 'release/')) # uses: personaclick/workflow/.github/workflows/reusable-android-google-play-publish.yaml@1cfee7e2e762eed3a3d7d67c413aa0bae7f5ffae # TODO replacements - uses: personaclick/workflow/.github/workflows/reusable-android-google-play-publish.yaml@d6d23e924224f75a134a47b364002c48bf0c88da + # TODO uncomment + # uses: personaclick/workflow/.github/workflows/reusable-android-google-play-publish.yaml@d6d23e924224f75a134a47b364002c48bf0c88da + uses: personaclick/workflow/.github/workflows/reusable-android-google-play-publish.yaml@fix/publish with: githubAppId: ${{ vars.PERSONACLICK_COURIER_ID }} packageName: "personaClick.demo_shop" From 14bde0fe37db0e2f2455d80a2fac857aa02925ab Mon Sep 17 00:00:00 2001 From: Kirill Ivanov Date: Tue, 29 Apr 2025 19:35:14 +0300 Subject: [PATCH 4/4] chore(github): comment for debug --- .github/workflows/build_apk.yaml | 14 ++++++++------ .github/workflows/publish.yaml | 20 ++++++++------------ 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build_apk.yaml b/.github/workflows/build_apk.yaml index 98f2ada..7596bf2 100644 --- a/.github/workflows/build_apk.yaml +++ b/.github/workflows/build_apk.yaml @@ -2,15 +2,17 @@ name: Build APK on: pull_request: - types: - - closed - branches: - - master - workflow_dispatch: + # TODO uncomment + # types: + # - closed + # branches: + # - master + # workflow_dispatch: jobs: build_release_apk: - if: github.event_name == 'workflow_dispatch' || (github.event_name == 'pull_request' && github.event.pull_request.merged == true && startsWith(github.event.pull_request.head.ref, 'release/')) + # TODO uncomment + # if: github.event_name == 'workflow_dispatch' || (github.event_name == 'pull_request' && github.event.pull_request.merged == true && startsWith(github.event.pull_request.head.ref, 'release/')) uses: personaclick/workflow/.github/workflows/reusable-android-release-apk.yaml@master with: appId: ${{ vars.PERSONACLICK_COURIER_ID }} diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index e0201b7..a213595 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -2,21 +2,17 @@ name: Publish to Play Store on: pull_request: - # TODO - # types: - # - closed - # branches: - # - master - # workflow_dispatch: + types: + - closed + branches: + - master + workflow_dispatch: jobs: google-play-publish: - # if: github.event_name == 'workflow_dispatch' || (github.event_name == 'pull_request' && github.event.pull_request.merged == true && startsWith(github.event.pull_request.head.ref, 'release/')) - # uses: personaclick/workflow/.github/workflows/reusable-android-google-play-publish.yaml@1cfee7e2e762eed3a3d7d67c413aa0bae7f5ffae - # TODO replacements - # TODO uncomment - # uses: personaclick/workflow/.github/workflows/reusable-android-google-play-publish.yaml@d6d23e924224f75a134a47b364002c48bf0c88da - uses: personaclick/workflow/.github/workflows/reusable-android-google-play-publish.yaml@fix/publish + if: github.event_name == 'workflow_dispatch' || (github.event_name == 'pull_request' && github.event.pull_request.merged == true && startsWith(github.event.pull_request.head.ref, 'release/')) + # TODO change commit hash + uses: personaclick/workflow/.github/workflows/reusable-android-google-play-publish.yaml@d6d23e924224f75a134a47b364002c48bf0c88da with: githubAppId: ${{ vars.PERSONACLICK_COURIER_ID }} packageName: "personaClick.demo_shop"