Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions .github/workflows/build_apk.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@ on:
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 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"
packageName: "personaClick.demo_shop"
aabReleasePath: "app/build/outputs/bundle/prodRelease/app-prod-release.aab"
propertiesFilePath: "version.properties"
secrets:
Expand Down
4 changes: 2 additions & 2 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ android {
namespace = "personaclick.demo_android.app"

defaultConfig {
applicationId = "personaclick.demo_shop"
applicationId = "personaClick.demo_shop"
}
}

Expand All @@ -37,4 +37,4 @@ dependencies {
implementation(project(":core"))
implementation(project(":feature"))
implementation(project(":navigation"))
}
}
Loading