search

keymanapp / keyman

Keyman cross platform input methods system running on Android, iOS, Linux, macOS, Windows and mobile and desktop web
https://keyman.com/
Other
372 stars 102 forks source link

chore: merge beta into master A18S1 #11332

Closed mcdurdin closed 2 weeks ago

mcdurdin commented 2 weeks ago

@keymanapp-test-bot skip

keymanapp-test-bot[bot] commented 2 weeks ago

User Test Results

Test specification and instructions

User tests are not required

Test Artifacts

mcdurdin commented 2 weeks ago

I don't see any entries for the stuff newly-merged shortly before this PR. Will we need another pass to handle that, or will it come out in the history-wash on release?

Can you be more specific?

jahorton commented 2 weeks ago

I don't see any entries for the stuff newly-merged shortly before this PR. Will we need another pass to handle that, or will it come out in the history-wash on release?

Can you be more specific?

These two PRs, at least, have no entry in history.md despite their inclusion as part of the changeset.

mcdurdin commented 2 weeks ago

These two PRs, at least, have no entry in history.md despite their inclusion as part of the changeset.

history.md is updated at release build time. So that will come through overnight.

jahorton commented 2 weeks ago

These two PRs, at least, have no entry in history.md despite their inclusion as part of the changeset.

history.md is updated at release build time. So that will come through overnight.

So, they'll end up as part of... stable-17.0's history.md, I guess? (Assuming we do get to press the big button today, anyway.) I forget if/when we copy that over to master's history.md - that's what's on my mind with this line of discussion.

mcdurdin commented 2 weeks ago

They'll be copied over from beta to master when we do one final merge of beta into master. Or we may do it manually if that's the only change.

jahorton commented 2 weeks ago

They'll be copied over from beta to master when we do one final merge of beta into master.

Ah, see, that's what I thought this was. My mistake, I suppose.

keyman-server commented 2 weeks ago

Changes in this pull request will be available for download in Keyman version 18.0.26-alpha