search

ibmruntimes / openj9-openjdk-jdk11

Extensions for OpenJDK 11 for Eclipse OpenJ9
GNU General Public License v2.0
32 stars 111 forks source link

Merge latest openj9 changes to 0.41 #708

Closed pshipton closed 1 year ago

pshipton commented 1 year ago

Manual merge, fixing the merge conflict in get_j9_source.sh

keithc-ca commented 1 year ago

This doesn't appear to have achieved what I think you expected for get_j9_source.sh; see https://github.com/ibmruntimes/openj9-openjdk-jdk11/blob/v0.41.0-release/closed/get_j9_source.sh#L59-L63.

pshipton commented 1 year ago

I did that intentionally, to avoid any accidental breakage from a new largely untested change. 0.41 has already diverged from the head stream so there is no benefit. We'll use the change for 0.42 to avoid having to create PRs like this one. I may end up always hard coding the branch names before we ship to avoid side effects.

keithc-ca commented 1 year ago

I may end up always hard coding the branch names

Wasn't the whole point of that series of pull requests to avoid the need for those manual changes?

pshipton commented 1 year ago

No, it's not the manual change I wanted to avoid, but having to create PRs like this to pick up the latest changes.

pshipton commented 1 year ago

In the past the manual change was done as soon as we branched. If we continue to make the manual change, now it can be done just before GA.

keithc-ca commented 1 year ago

If we continue to make the manual change

My preference is that we don't do that.

pshipton commented 1 year ago

Sure, we can see how it goes, and if anyone complains about the magic.