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

Update JNR projects to latest #6482

Merged
merged 9 commits into from Dec 4, 2020
Merged

Conversation

headius
Copy link
Member

@headius headius commented Dec 2, 2020

This picks up changes to the automatic module name from
jnr/jffi#67 but also updates JNR projects across the board to grab
all recent bug fixes.

This picks up changes to the automatic module name from
jnr/jffi#67 but also updates JNR projects across the board to grab
all recent bug fixes.
@headius headius added this to the JRuby 9.2.14.0 milestone Dec 2, 2020
@headius
Copy link
Member Author

headius commented Dec 2, 2020

@enebo This is a larger change than the master update in #6481 but I think it should go into 9.2.14 to pick up various fixes to the JNR projects that have only been applied to master so far.

@ahorek
Copy link
Contributor

ahorek commented Dec 2, 2020

#6460 should be backported with this change

@headius
Copy link
Member Author

headius commented Dec 2, 2020

#6460 should be backported with this change

Good call, I can take care of it.

@headius
Copy link
Member Author

headius commented Dec 3, 2020

@ahorek This PR appears to be hanging in a multicast socket test. Maybe you remember another fix we did on master that needs to be backported?

@headius
Copy link
Member Author

headius commented Dec 3, 2020

Aha... perhaps the constant fixes here: #6388

headius and others added 2 commits December 3, 2020 14:45
@headius
Copy link
Member Author

headius commented Dec 3, 2020

The fixes in #6388 do not appear to address the hanging test.

@headius
Copy link
Member Author

headius commented Dec 3, 2020

Ok possibly false negative since this test appears to hang on macOS even on master. I have pushed cherry-picks of all the changes that seemed relevant.

@headius
Copy link
Member Author

headius commented Dec 3, 2020

This is ready to merge, @enebo. The hangs were apparently related to the updated socket constants that @ahorek and I applied to master; when jnr-constants was updated those same changes needed to be applied to the 9.2 branch. The risk here seems fairly low but I would like a review before merging.

@ahorek
Copy link
Contributor

ahorek commented Dec 3, 2020

could you release https://github.com/jnr/jnr-constants/commits/master ? it should be safe.

I think that's all. +1

@headius
Copy link
Member Author

headius commented Dec 4, 2020

@ahorek Ahh it has been a while for that one. I will release it and the projects that use it.

@headius headius merged commit ccd4cb0 into jruby:jruby-9.2 Dec 4, 2020
@headius headius mentioned this pull request Dec 8, 2020
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.

None yet

2 participants