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

Upstream openjdk/jdk(head) now branching releases rather than forking #3841

Closed
andrew-m-leonard opened this issue Jun 10, 2024 · 5 comments · Fixed by adoptium/mirror-scripts#55 or #3852
Assignees
Labels
testing Issues that enhance or fix our test suites

Comments

@andrew-m-leonard
Copy link
Contributor

andrew-m-leonard commented Jun 10, 2024

openjdk/jdk(head) will now be doing release branching, no longer forking repositories. See: https://mail.openjdk.org/pipermail/jdk-dev/2024-March/008834.html

This obviously means our jdk(head) mirror and jdk-23+ build-scripts will need updating

We currently have:

  • master : Direct mirror of openjdk/jdk(master)
  • dev : Merge of Adoptium “patches” with master(HEAD)
  • release : Sequential merge of latest jdk-NN+bb tags with Adoptium “patches” and tagged as jdk-NN+bb_adopt

With the branching of the upstream “jdk23” branch, we now have no view of jdk-23, as our “release” branch is now jdk-24+1_adopt, and “dev” is jdk-24(HEAD)

My immediate thought is:

  • Add a "release_jdk23" branch, and update skaraMirror.sh to perform the same logic as before but from upstream “jdk23" branch, ie. sequential merging of latest jdk-23+nn tags with Adoptium "patches".
  • Add a "dev_jdk23" branch, ie. jdk23(HEAD) merged with Adoptium "patches"
  • temurin-build scripts updated for jdk-23+ targets to clone adoptium/jdk and checkout the appropriate "branch"

Thoughts?

@github-actions github-actions bot added the testing Issues that enhance or fix our test suites label Jun 10, 2024
@sxa
Copy link
Member

sxa commented Jun 10, 2024

Seems reasonable - am I right in saying this is purely during the stabilization process and the u repositories are still expected to be produced for e,g, 23.0.1 and beyond?

@andrew-m-leonard
Copy link
Contributor Author

Seems reasonable - am I right in saying this is purely during the stabilization process and the u repositories are still expected to be produced for e,g, 23.0.1 and beyond?

@sxa I think that is still being debated, I think there's suggestions that a branching in a new openjdk/jdk-updates might happen, if the jdk(head) experience goes well....

@jerboaa
Copy link
Contributor

jerboaa commented Jun 12, 2024

Seems reasonable - am I right in saying this is purely during the stabilization process and the u repositories are still expected to be produced for e,g, 23.0.1 and beyond?

Yes. There will be a separate discussion for update releases (covering the 23u part) in the future. Let's keep this focused on the stabilization repo change only for now.

@jerboaa
Copy link
Contributor

jerboaa commented Jun 12, 2024

The EA build status messages on slack will need updating too. It currently claims newest build tag for JDK 23 is 24+1, rather than 23+26.

@sxa
Copy link
Member

sxa commented Jun 15, 2024

Re-opening as this is not closed until #3852 is also merged.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
testing Issues that enhance or fix our test suites
Projects
No open projects
Status: Done
3 participants