diff --git a/.github/actions/create-release-notes/action.yml b/.github/actions/create-release-notes/action.yml index 5023d7b89..de1b70e28 100644 --- a/.github/actions/create-release-notes/action.yml +++ b/.github/actions/create-release-notes/action.yml @@ -18,3 +18,5 @@ runs: current=`git tag -l --sort=-creatordate | head -n 1` echo "Full release change log: https://github.com/home-assistant/android/releases/tag/${current}" > app/src/main/play/release-notes/en-US/default.txt + echo Github Changelog: + cat ./app/build/outputs/changelogGithub diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 386d6143c..9e9ee142c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,7 +31,7 @@ jobs: name: Create Release Number id: rel_number with: - beta: true + beta: false - uses: ./.github/actions/inflate-secrets name: Inflate Secrets @@ -44,6 +44,11 @@ jobs: - uses: ./.github/actions/create-release-notes name: Create Release Notes + - name: Swap release notes + run: | + rm ./app/build/outputs/changelogBeta + cp ./app/build/outputs/changelogGithub ./app/build/outputs/changelogBeta + - name: Build Release env: KEYSTORE_PASSWORD: ${{ secrets.ORIGINAL_KEYSTORE_FILE_PASSWORD }} @@ -154,3 +159,12 @@ jobs: VERSION: ${{ steps.rel_number.outputs.version }} VERSION_CODE: ${{ steps.rel_number.outputs.version-code }} run: ./gradlew publishFullReleaseBundle + + - name: Promote to Beta to Production + env: + KEYSTORE_PASSWORD: ${{ secrets.UPLOAD_KEYSTORE_FILE_PASSWORD }} + KEYSTORE_ALIAS: ${{ secrets.UPLOAD_KEYSTORE_ALIAS }} + KEYSTORE_ALIAS_PASSWORD: ${{ secrets.UPLOAD_KEYSTORE_ALIAS_PASSWORD }} + VERSION: ${{ steps.rel_number.outputs.version }} + VERSION_CODE: ${{ steps.rel_number.outputs.version-code }} + run: ./gradlew promoteArtifact --from-track beta --promote-track production