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.

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

Already on GitHub? Sign in to your account

Release 14.6.0 merge into master #7637

Closed
wants to merge 2 commits into from
Closed

Release 14.6.0 merge into master #7637

wants to merge 2 commits into from

Conversation

michael-wb
Copy link
Contributor

What, How & Why?

Release 14.6.0 merge into master


* Prepare release

* [bindgen] expose both SyncUser and app::User (#7634)

* RCORE-2060 Enabling 'cancel_waits_on_nonfatal_error' does not cancel waits during location update while offline (#7528)

* added tests using cancel_waits_on_nonfatal_error and fix operation during location update
* Updated changelog and updated comments/debug statements
* fix swift build and test and tsan errors
* Added test to replicate swift autoopen feature
* Fixed swift build issue
* removed an unused function
* Updates from review

---------

Co-authored-by: Kenneth Geisshirt <[email protected]>
Co-authored-by: Michael Wilkerson-Barker <[email protected]>
@cla-bot cla-bot bot added the cla: yes label Apr 26, 2024
@michael-wb michael-wb added the no-jira-ticket Skip checking the PR title for Jira reference label Apr 26, 2024
@@ -1,15 +1,13 @@
# NEXT RELEASE
# 14.6.0 Release notes
Copy link
Collaborator

Choose a reason for hiding this comment

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

should you add the section for next release now?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I wasn't sure if it was added as part of this merge or in a separate PR. I can add it now.

Copy link
Collaborator

Choose a reason for hiding this comment

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

don't know either. but at least now we update the changelog for the next release

Copy link

coveralls-official bot commented Apr 26, 2024

Pull Request Test Coverage Report for Build michael.wilkersonbarker_1063

Details

  • 211 of 254 (83.07%) changed or added relevant lines in 5 files are covered.
  • 86 unchanged lines in 16 files lost coverage.
  • Overall coverage increased (+0.008%) to 90.753%

Changes Missing Coverage Covered Lines Changed/Added Lines %
test/object-store/util/test_file.cpp 27 41 65.85%
test/object-store/realm.cpp 173 202 85.64%
Files with Coverage Reduction New Missed Lines %
src/realm/object-store/sync/app.hpp 1 88.57%
src/realm/sync/noinst/server/server.cpp 1 73.93%
src/realm/util/serializer.cpp 1 90.43%
test/fuzz_tester.hpp 1 57.73%
test/test_query2.cpp 1 98.73%
src/realm/cluster.cpp 2 75.87%
src/realm/query_expression.cpp 2 86.62%
src/realm/util/to_string.cpp 2 97.62%
src/realm/sync/instruction_replication.cpp 3 91.48%
src/realm/sync/noinst/server/server_history.cpp 3 63.57%
Totals Coverage Status
Change from base Build 2263: 0.008%
Covered Lines: 212440
Relevant Lines: 234086

💛 - Coveralls

@ironage
Copy link
Contributor

ironage commented Apr 26, 2024

Ideally, the commits with actual code changes should have their own commit in our mainline history, but it looks like they have been squashed together from the prepare branch. Since it is only a few changes, it will be manageable to figure out if we need to untangle them in the future. I think the more important thing is that the commit that was tagged as a release ends up on master, so please make sure this PR is not merged by squashing. Our release process documentation is terribly out of date, so I'm just grateful a release happened :)

@tgoyne
Copy link
Member

tgoyne commented Apr 26, 2024

Should maybe delete the tag and replace it with one where the history isn't a mess?

I don't really understand why the release process is so complicated. It seems to be designed to maximize the number of places where errors like this can be made.

@ironage
Copy link
Contributor

ironage commented Apr 26, 2024

@tgoyne the release process sorely needs to be modernized and simplified now that we don't produce any build artifacts.
@michael-wb it will take some git work to untangle, but better now than after merging to master. Are you up for it?

@tgoyne tgoyne closed this Apr 27, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 27, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
cla: yes no-jira-ticket Skip checking the PR title for Jira reference
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants