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(manager/asdf): add support for java semeru and semeru-jre #25063

Merged
merged 6 commits into from Nov 1, 2023

Conversation

MPV
Copy link
Contributor

@MPV MPV commented Oct 5, 2023

Changes

This adds support for the asdf java semeru.

Context

This has been discussed before in at least the following issues:

Similar to what was recently done
(for temurin) in:

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

@MPV
Copy link
Contributor Author

MPV commented Oct 5, 2023

For example, here's the currently existing asdf versions for semeru:

$ asdf list-all java | grep 'semeru'
semeru-jre-openj9-8u302-b08_openj9-0.27.0
semeru-jre-openj9-8u312-b07_openj9-0.29.0
semeru-jre-openj9-8u322-b06_openj9-0.30.0
semeru-jre-openj9-8u332-b09_openj9-0.32.0
semeru-jre-openj9-8u345-b01_openj9-0.33.1
semeru-jre-openj9-8u362-b09_openj9-0.36.0
semeru-jre-openj9-8u372-b07_openj9-0.38.0
semeru-jre-openj9-8u382-b05_openj9-0.40.0
semeru-jre-openj9-11.0.12+7_openj9-0.27.0
semeru-jre-openj9-11.0.13+8_openj9-0.29.0
semeru-jre-openj9-11.0.14+9_openj9-0.30.0
semeru-jre-openj9-11.0.14.1+1_openj9-0.30.1
semeru-jre-openj9-11.0.15+10_openj9-0.32.0
semeru-jre-openj9-11.0.16+8_openj9-0.33.0
semeru-jre-openj9-11.0.16.1+1_openj9-0.33.1
semeru-jre-openj9-11.0.17+8_openj9-0.35.0
semeru-jre-openj9-11.0.18+10_openj9-0.36.1
semeru-jre-openj9-11.0.19+7_openj9-0.38.0
semeru-jre-openj9-11.0.20+8_openj9-0.40.0
semeru-jre-openj9-11.0.20.1+1_openj9-0.40.0
semeru-jre-openj9-16.0.2+7_openj9-0.27.0
semeru-jre-openj9-17.0.1+12_openj9-0.29.1
semeru-jre-openj9-17.0.2+8_openj9-0.30.0
semeru-jre-openj9-17.0.3+7_openj9-0.32.0
semeru-jre-openj9-17.0.4+8_openj9-0.33.0
semeru-jre-openj9-17.0.4.1+1_openj9-0.33.1
semeru-jre-openj9-17.0.5+8_openj9-0.35.0
semeru-jre-openj9-17.0.6+10_openj9-0.36.0
semeru-jre-openj9-17.0.7+7_openj9-0.38.0
semeru-jre-openj9-17.0.8+7_openj9-0.40.0
semeru-jre-openj9-17.0.8.1+1_openj9-0.40.0
semeru-jre-openj9-_openj9-
semeru-openj9-8u302-b08_openj9-0.27.0
semeru-openj9-8u312-b07_openj9-0.29.0
semeru-openj9-8u322-b06_openj9-0.30.0
semeru-openj9-8u332-b09_openj9-0.32.0
semeru-openj9-8u345-b01_openj9-0.33.1
semeru-openj9-8u362-b09_openj9-0.36.0
semeru-openj9-8u372-b07_openj9-0.38.0
semeru-openj9-8u382-b05_openj9-0.40.0
semeru-openj9-11.0.12+7_openj9-0.27.0
semeru-openj9-11.0.13+8_openj9-0.29.0
semeru-openj9-11.0.14+9_openj9-0.30.0
semeru-openj9-11.0.14.1+1_openj9-0.30.1
semeru-openj9-11.0.15+10_openj9-0.32.0
semeru-openj9-11.0.16+8_openj9-0.33.0
semeru-openj9-11.0.16.1+1_openj9-0.33.1
semeru-openj9-11.0.17+8_openj9-0.35.0
semeru-openj9-11.0.18+10_openj9-0.36.1
semeru-openj9-11.0.19+7_openj9-0.38.0
semeru-openj9-11.0.20+8_openj9-0.40.0
semeru-openj9-11.0.20.1+1_openj9-0.40.0
semeru-openj9-16.0.2+7_openj9-0.27.0
semeru-openj9-17.0.1+12_openj9-0.29.1
semeru-openj9-17.0.2+8_openj9-0.30.0
semeru-openj9-17.0.3+7_openj9-0.32.0
semeru-openj9-17.0.4+8_openj9-0.33.0
semeru-openj9-17.0.4.1+1_openj9-0.33.1
semeru-openj9-17.0.5+8_openj9-0.35.0
semeru-openj9-17.0.6+10_openj9-0.36.0
semeru-openj9-17.0.7+7_openj9-0.38.0
semeru-openj9-17.0.8+7_openj9-0.40.0
semeru-openj9-17.0.8.1+1_openj9-0.40.0
semeru-openj9-_openj9-

lib/modules/manager/asdf/extract.spec.ts Outdated Show resolved Hide resolved
lib/modules/manager/asdf/extract.spec.ts Outdated Show resolved Hide resolved
lib/modules/manager/asdf/upgradeable-tooling.ts Outdated Show resolved Hide resolved
MPV and others added 3 commits October 9, 2023 15:43
...for `currentValue` to match the test data.
Drop `<openj9>` regex capture group.

Co-authored-by: Michael Kriese <michael.kriese@visualon.de>
@MPV
Copy link
Contributor Author

MPV commented Oct 10, 2023

@viceice could you take another look?

@viceice
Copy link
Member

viceice commented Oct 10, 2023

use the re-request GitHub button besides the reviewers

@MPV MPV requested a review from viceice October 10, 2023 19:58
@MPV
Copy link
Contributor Author

MPV commented Oct 10, 2023

use the re-request GitHub button besides the reviewers

Thanks @viceice, that's done now.

@MPV
Copy link
Contributor Author

MPV commented Oct 16, 2023

@viceice I ran prettier now too, so the PR should be good to go — could you take a look?

@secustor
Copy link
Collaborator

secustor commented Nov 1, 2023

@MPV
Copy link
Contributor Author

MPV commented Nov 1, 2023

@secustor Thanks, should be fixed properly now (as I ran pnpm prettier-fix this time).

Copy link
Collaborator

@secustor secustor left a comment

Choose a reason for hiding this comment

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

Please read the Contributor guide and do not ping maintainers

https://github.com/renovatebot/renovate/blob/main/.github/contributing.md

@secustor secustor added this pull request to the merge queue Nov 1, 2023
Merged via the queue into renovatebot:main with commit 25292f0 Nov 1, 2023
36 checks passed
@renovate-release
Copy link
Collaborator

🎉 This PR is included in version 37.39.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

Copy link
Member

@viceice viceice left a comment

Choose a reason for hiding this comment

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

__

@@ -261,6 +261,26 @@ export const upgradeableTooling: Record<string, ToolingDefinition> = {
currentValue: adoptOpenJreMatches.version,
};
}
const semeruJdkMatches = version.match(
/^semeru-openj9-(?<version>\d\S+)_openj9-(?<openj9>\d\S+)/
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
/^semeru-openj9-(?<version>\d\S+)_openj9-(?<openj9>\d\S+)/
/^semeru-openj9-(?<version>\d\S+)_openj9-(?<openj9>\d\S+)/

this will create invalid PR's when openj9 version changes.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ouch, yes that's unfortunate.

Do you have any ideas how we might solve this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Copy link
Member

Choose a reason for hiding this comment

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

this isn't easily solvable, we should revert this PR until we've a proper working datasource / versioning for this.

};
}
const semeruJreMatches = version.match(
/^semeru-jre-openj9-(?<version>\d\S+)_openj9-\d\S+/
Copy link
Member

Choose a reason for hiding this comment

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

same here

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

Co-authored-by: Michael Kriese <michael.kriese@visualon.de>
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 2, 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

4 participants