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

feat(presets): update java LTS workaround to include liberica #25285

Merged
merged 1 commit into from Oct 20, 2023

Conversation

candrews
Copy link
Contributor

Changes

Match the bellsoft liberica openjdk/openjre images in the javaLTSVersions preset.

Bellsoft's documentation for their images: https://bell-sw.com/blog/bellsoft-s-docker-hub-images-overview/

An example image is: https://hub.docker.com/r/bellsoft/liberica-openjdk-debian

Liberica is the Java distribution used by default by Paketo buildpacks: https://paketo.io/docs/howto/java/#use-an-alternative-jvm

Context

Documentation (please check one with an [x])

  • I have updated the documentation, or
  • No documentation update is required

How I've tested my work (please select one)

I have verified these changes via:

  • Code inspection only, or
  • Newly added/modified unit tests, or
  • No unit tests but ran on a real repository, or
  • Both unit tests + ran on a real repository

viceice
viceice previously approved these changes Oct 18, 2023
Signed-off-by: Craig Andrews <candrews@integralblue.com>
@rarkins rarkins added this pull request to the merge queue Oct 20, 2023
Merged via the queue into renovatebot:main with commit 4acde25 Oct 20, 2023
36 checks passed
@renovate-release
Copy link
Collaborator

🎉 This PR is included in version 37.31.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

@@ -118,7 +118,10 @@ export const presets: Record<string, Preset> = {
'java-jre',
'sapmachine',
],
matchPackagePatterns: ['^azul/zulu-openjdk'],
matchPackagePatterns: [
'^azul/zulu-openjdk',
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know this is already merged, but shouldn't the azul and bellsoft packages be added to the matchPackageNames array above so that it follows the javaLTSVersions allowedVersions expression?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The azul and bellsoft names are not exact matches, and I believe matchPackageNames needs exact matches:

Use this field if you want to have one or more exact name matches in your package rule.

https://docs.renovatebot.com/configuration-options/#matchpackagenames

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The intent of this this javaLTSVersions preset when I originally created it was to keep updates only to LTS versions (ie: 8, 11, 17, 21) etc...

If we aren't adding the azul and bellsoft flavors to the allowedVersions range, then perhaps this is better suited to a new java-based preset

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The intent of this this javaLTSVersions preset when I originally created it was to keep updates only to LTS versions (ie: 8, 11, 17, 21) etc...

Yes, that's what I intend with the azul and liberica images. Currently, Renovate tries to bump those image references to non-LTS versions (ex, 18) - the intent is to only bump to LTS versions.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, in that case I think you'll need to duplicate the allowedVersions into your package rule

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's the same package rule - can you please clarify what should be duplicate and where?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apologies @candrews - the diff was rendering strangely on my mobile. Please ignore my comments and thanks for enhancing this workaround

jon4hz pushed a commit to jon4hz/renovate that referenced this pull request Nov 9, 2023
…tebot#25285)

Signed-off-by: Craig Andrews <candrews@integralblue.com>
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 22, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants