diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index e06952a..e4d0926 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -11,10 +11,10 @@ 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 + uses: personaclick/workflow/.github/workflows/reusable-android-google-play-publish.yaml@7907f21814b2f998ffd80451754ce026e3553265 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/.github/workflows/version.yaml b/.github/workflows/version.yaml index c2442c2..34a0bcf 100644 --- a/.github/workflows/version.yaml +++ b/.github/workflows/version.yaml @@ -11,7 +11,7 @@ on: jobs: bump-version: - 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/')) + if: github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && !startsWith(github.event.pull_request.head.ref, 'release/')) uses: personaclick/workflow/.github/workflows/reusable-multiplatform-version-bump.yaml@master permissions: write-all secrets: diff --git a/.releaserc.yml b/.releaserc.yml index e7b04bf..7051510 100644 --- a/.releaserc.yml +++ b/.releaserc.yml @@ -13,7 +13,7 @@ ], [ "@semantic-release/exec", - { "prepareCmd": "./scripts/update_version.sh ${nextRelease.version}" }, + "prepareCmd": "chmod +x ./scripts/update_version.sh && ./scripts/update_version.sh ${nextRelease.version}", ], ], } diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 205fa11..5808be5 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" } } diff --git a/settings.gradle.kts b/settings.gradle.kts index 2ac8d07..442997e 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -27,3 +27,4 @@ include(":core") include(":app") include(":ui") include(":navigation") +