Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge release/2024.06.02 into master #8462

Merged
merged 9 commits into from
Jun 18, 2024
Merged

Merge release/2024.06.02 into master #8462

merged 9 commits into from
Jun 18, 2024

Conversation

rtsisyk
Copy link
Contributor

@rtsisyk rtsisyk commented Jun 14, 2024

No description provided.

pastk and others added 9 commits June 2, 2024 20:45
@pastk @rtsisyk
@biodranik @matheusgomesms @louwers
[store] 2024.06.02 Release Notes
e882e01 
Co-authored-by: Roman Tsisyk <[email protected]>
Co-authored-by: Alexander Borsuk <[email protected]>
Co-authored-by: Matheus Gomes <[email protected]>
Co-authored-by: Bart Louwers <[email protected]>
Co-authored-by: Alexander Borsuk <[email protected]>
Signed-off-by: Roman Tsisyk <[email protected]>
@vng @rtsisyk
[planet] New data from 240528.
3cfb5f8 
Signed-off-by: Viktor Govako <[email protected]>
@vng @rtsisyk
[search][tests] Added UK postcodes real test.
900df47 
Signed-off-by: Viktor Govako <[email protected]>
@vng @rtsisyk
[search][tests] Updated quality tests.
9b61e78 
Signed-off-by: Viktor Govako <[email protected]>
@vng @rtsisyk
[routing][tests] Updated routing tests.
07e0943 
Signed-off-by: Viktor Govako <[email protected]>
@rtsisyk
Bump versions
0e60a7c 
Signed-off-by: rtsisyk <[email protected]>
@pastk @rtsisyk
Update release notes
cebc765 
Signed-off-by: Konstantin Pastbin <[email protected]>
@pastk @rtsisyk
[tools] Add update_gplay_relnotes.sh script
b9cc76c 
Signed-off-by: Konstantin Pastbin <[email protected]>
@Ferenc-
[store] Add 2024.06 release notes to .metainfo.xml
26b78a3 
Signed-off-by: Ferenc G茅czi <[email protected]>
@rtsisyk rtsisyk requested review from biodranik, vng and pastk June 14, 2024 04:18
@rtsisyk rtsisyk mentioned this pull request Jun 14, 2024
Closed
57 tasks
@rtsisyk
Copy link
Contributor Author

rtsisyk commented Jun 14, 2024

don't rebase please.

@biodranik
Copy link
Member

Is it possible to rebase commits for master merging, but leave the branch for hotfix to publish today?

Merges are disabled for the repo.

@pastk
Copy link
Contributor

pastk commented Jun 15, 2024

Is it possible to rebase commits for master merging, but leave the branch for hotfix to publish today?

Merges are disabled for the repo.

A possible workaround is to make another temp branch (identical to release/2024.06.02), rebase it and then merge to master.
The original release branch will stay intact then.

@rtsisyk
Copy link
Contributor Author

rtsisyk commented Jun 16, 2024

Merges are disabled for the repo.

What is the problem with merges?

@biodranik
Copy link
Member

What is the problem with merges?

We want to keep as flat history as possible, for easier rebases and reverts. Disabling merges guarantees that. Enabling merges does not guarantee that, some PRs may be merged accidentally instead of rebased. Is there a way to enable merge only for release-xxx branches on Github?

@rtsisyk
Copy link
Contributor Author

rtsisyk commented Jun 18, 2024

I can merge it manually.

@rtsisyk rtsisyk merged commit 2908f56 into master Jun 18, 2024
17 of 18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@biodranik biodranik biodranik approved these changes

@pastk pastk pastk approved these changes

@vng vng Awaiting requested review from vng

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@rtsisyk @biodranik @pastk @vng @Ferenc-