Request for Sponsorship for Collaboration with OpenJDK

[Andrew Hughes]

On 11:37 Wed 08 Feb     , Severin Gehwolf wrote:
> Hi,
> 
> On Wed, 2023-02-08 at 10:13 +0000, Henry GALVEZ wrote:
> > Hi Severin
> > 
> > After reviewing the guidelines, I understand that I need to:
> > 
> > 0. Have SKARA installed
> 
> Not necessarily. Plain git works too (if you know what to do). Up to
> you.
>

Just to second what Severin says, I've only ever used the Skara tools
for maintainer work - basically running checking locally on changes
that have to be handled outside the GitHub process - and not for
regular work on code changes and backports.

If you already know how to work with a GitHub pull request, it should
be much the same with a few minor process changes to work with the
Skara bot which operates on the pull request.

...

> 
> > 
> > 4. Do a git fetch of the repo https://github.com/openjdk/jdk, but I
> > am unsure of which commit-sha to take, should it be the latest from
> > version 11.0.17 or the one that fixes the error in version 17.0.7?
> 
> I'd go with the commit closest to the version you want to backport to.
> So in this case, the OpenJDK 17 fix. So fetch from:
> 
> https://github.com/openjdk/jdk17u-dev
> 
> Sha 244d1942d2e9f2ba75267acc16a02041c1e8080e
> 

The easiest way to find the appropriate commit is to go to the bug -
in this case, https://bugs.openjdk.org/browse/JDK-8293562 - and look
in the 'links to' section. You often need to click 'Show x more links'
to reveal this.

As Severin says, go with the closest JDK version to the JDK you
are backporting to. It may be that the backport work from e.g. 20
to 17 has already resolved some issues and you don't want to end
up doing the same work over again, possibly in a different way.

> 
> > 6. Correct any conflicts
> 
> Yes.
>

An easy way to see what you're up against is the /backport command
in Skara. Sadly, I think this is only accessible to those with
the OpenJDK Committer role, but someone can run it on your behalf.

You can see it being run by Goetz for this commit's backport to
17u here:

https://github.com/openjdk/jdk/commit/03f25a9c6924430ec4063b801b2b6ca55b9067c9#commitcomment-93973041

I took the liberty of doing it for jdk11u-dev on your behalf:

https://github.com/openjdk/jdk/commit/03f25a9c6924430ec4063b801b2b6ca55b9067c9#commitcomment-99883929

It seems there will be one conflict so you'll have to do this one
manually, but the comment at least provides some pointers on how
to do so.

I did this on the jdk commit rather than the jdk17u one, but as the
jdk17u one was unchanged from the original, this shouldn't make any
difference.

Good luck and please feel free to ask if you have any more questions
or issues.

All the best,
-- 
Andrew :)
Pronouns: he / him or they / them
Senior Free Java Software Engineer
OpenJDK Package Owner
Red Hat, Inc. (http://www.redhat.com)

PGP Key: ed25519/0xCFDA0F9B35964222 (hkp://keys.gnupg.net)
Fingerprint = 5132 579D D154 0ED2 3E04  C5A0 CFDA 0F9B 3596 4222
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <https://mail.openjdk.org/pipermail/jdk-updates-dev/attachments/20230209/fabfc466/signature.asc>