Skip to content

feat(android): Bundle GITHUB_SHA into Android client#6405

Merged
jamilbk merged 2 commits intomainfrom
ci/bundle-git-sha-into-android
Aug 27, 2024
Merged

feat(android): Bundle GITHUB_SHA into Android client#6405
jamilbk merged 2 commits intomainfrom
ci/bundle-git-sha-into-android

Conversation

@jamilbk
Copy link
Copy Markdown
Member

@jamilbk jamilbk commented Aug 22, 2024

Closes #6400

Screenshot 2024-08-21 at 11 24 16 PM

@jamilbk jamilbk requested a review from thomaseizinger August 22, 2024 06:25
@vercel
Copy link
Copy Markdown

vercel Bot commented Aug 22, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
firezone ✅ Ready (Inspect) Visit Preview 💬 Add feedback Aug 26, 2024 9:29pm

@jamilbk jamilbk changed the title Bundle GITHUB_SHA into Android client feat(android): Bundle GITHUB_SHA into Android client Aug 22, 2024
@jamilbk jamilbk requested a review from ReactorScram August 22, 2024 07:08
Copy link
Copy Markdown
Member

@thomaseizinger thomaseizinger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

git-describe is made for this but it is output is much nicer if you have a tag it can use.

multiDexEnabled = true
testInstrumentationRunner = "dev.firezone.android.core.HiltTestRunner"

val gitSha = System.getenv("GITHUB_SHA") ?: "unknown"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about builds that don't happen on CI? Where are the builds made that get submitted to the play store for review?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It'll be unknown. Playstore builds always happen via the Kotlin workflow in CI.

@jamilbk
Copy link
Copy Markdown
Member Author

jamilbk commented Aug 22, 2024

git-describe is made for this but it is output is much nicer if you have a tag it can use.

Yeah I think I would be open to tagging these if there was automation, otherwise we'll inevitable run into cases where the tag doesn't match the published release. It seems like it could be possible using the Publishing API and some automation: https://developers.google.com/android-publisher/api-ref/rest

@thomaseizinger
Copy link
Copy Markdown
Member

git-describe is made for this but it is output is much nicer if you have a tag it can use.

Yeah I think I would be open to tagging these if there was automation, otherwise we'll inevitable run into cases where the tag doesn't match the published release. It seems like it could be possible using the Publishing API and some automation: https://developers.google.com/android-publisher/api-ref/rest

I found this: https://github.com/marketplace/actions/upload-android-release-to-play-store

It is also referenced in a couple of blog posts on automating Android releases.

How about this:

@jamilbk
Copy link
Copy Markdown
Member Author

jamilbk commented Aug 22, 2024

git-describe is made for this but it is output is much nicer if you have a tag it can use.

Yeah I think I would be open to tagging these if there was automation, otherwise we'll inevitable run into cases where the tag doesn't match the published release. It seems like it could be possible using the Publishing API and some automation: https://developers.google.com/android-publisher/api-ref/rest

I found this: https://github.com/marketplace/actions/upload-android-release-to-play-store

It is also referenced in a couple of blog posts on automating Android releases.

How about this:

How does this solve the review rejection possibility though? It happens often enough that we should account for it.

We need it to happen the other way around. When the app is approved, publish its release and attach the APK.

@thomaseizinger
Copy link
Copy Markdown
Member

How does this solve the review rejection possibility though? It happens often enough that we should account for it.

We need it to happen the other way around. When the app is approved, publish its release and attach the APK.

It doesn't directly. Could we just treat such version numbers as burnt and make a tag after? We can still merge the changelogs and stuff into the new one.

@jamilbk
Copy link
Copy Markdown
Member Author

jamilbk commented Aug 26, 2024

It doesn't directly. Could we just treat such version numbers as burnt and make a tag after? We can still merge the changelogs and stuff into the new one.

Hmm let's move discussion to #3321

@jamilbk jamilbk added this pull request to the merge queue Aug 27, 2024
Merged via the queue into main with commit 2b030d8 Aug 27, 2024
@jamilbk jamilbk deleted the ci/bundle-git-sha-into-android branch August 27, 2024 05:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Android: Bundle git sha into build and show in settings

2 participants