-
Notifications
You must be signed in to change notification settings - Fork 76
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
Patch slonik to close streams more reliably #599
Patch slonik to close streams more reliably #599
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we're hoping to ship the patched Slonik with the upcoming patch release. We'll release off the release
branch so that we don't ship other commits in master
. After the release, we'll merge release
into master
. (For what it's worth, patch releases are usually simpler than this one has been. Usually patch releases come pretty soon after the last major release, so there aren't as many differences between the release branch and master
.) To add this PR to the patch release, could you target the release
branch? You'll probably first need to rebase onto origin/release
locally, then force-push.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The unit tests look good to me!
f75ed79
to
e368a7c
Compare
@matthew-white this has been rebased onto current |
e368a7c
to
6211689
Compare
Maybe worth including gajus/slonik#414? |
Unless it's really complicated for some reason I think that's a good idea. |
gajus/slonik#414 has been incorporated |
Took a quick look, all looks like I expect, but I think it would be good for @matthew-white to take one last look since you two have all the context. |
@alxndrsn, would you mind creating a PR to the |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see that the PR description mentions that gajus/slonik#420 has been backported as well. That Slonik fix hasn't been merged yet, so I feel less sure about including that one. But it also seems OK to go ahead and merge: if we need to, we can always update our Slonik patch. Plus, we're hoping to ship #564 for the release.
I'm also unsure why import/no-extraneous-dependencies
is being tripped. Do we need to configure or update eslint-plugin-import
somehow? But also, there doesn't seem to be a lot of risk around these ESLint violations, so that question might not be worth digging into.
fb52f3e
to
e8b4cfd
Compare
I've double-checked, and it doesn't seem to be necessary 👍 |
e8b4cfd
to
48dccf5
Compare
Won't reliably pass github-actions checks until #638 is merged |
Closes #482
Closes #485
Closes #565
Incorporates backported fixes: