-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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
Add missing no jdk distributions #4722
Add missing no jdk distributions #4722
Conversation
a09e3f3
to
a7d24c3
Compare
CC @dblock |
Gradle Check (Jenkins) Run Completed with:
|
Codecov Report
@@ Coverage Diff @@
## main #4722 +/- ##
============================================
+ Coverage 70.74% 70.77% +0.03%
+ Complexity 57592 57580 -12
============================================
Files 4660 4660
Lines 276466 276466
Branches 40285 40285
============================================
+ Hits 195583 195678 +95
+ Misses 64597 64511 -86
+ Partials 16286 16277 -9
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
Gradle Check (Jenkins) Run Completed with:
|
this seems to be an unrelated false-reject :( |
Gradle Check (Jenkins) Run Completed with:
|
@rursprung rebase and we're good to go, thanks! |
a7d24c3
to
23c7357
Compare
Gradle Check (Jenkins) Run Completed with:
|
seems to be yet again an unrelated false reject 😞 |
by convention all supported platforms should also have a gradle target to produce a no-jdk build and that target should be called `no-jdk-[platform]`. this is a first step in the path to publishing the no-jdk distributions as part of the release, as there are use-cases where a specific JDK should be used instead of the packaged one and it's cleaner to use a small distribution which doesn't bring along an unneeded JDK (the JDK greatly increases the resulting distribution since). note that i failed to rename the `linux-s390x` target, it seems that there's too much generic build code out there which tries to stitch together that name and then fails if it doesn't find it. this is part of opensearch-build#99. Signed-off-by: Ralph Ursprung <[email protected]>
this is primarily to document the JDK & No JDK setup (to codify it for the future), however the README can be extended in the future to document more information which is currently hidden away only somewhere in the code. Signed-off-by: Ralph Ursprung <[email protected]>
23c7357
to
45ae1ba
Compare
Gradle Check (Jenkins) Run Completed with:
|
@dblock: this should now be ready to be merged: no false-reject, no merge conflict (for the next few hours, anyway 😖), already approved. it'd be great if you could hit that merge button 🙂 (or enable auto-merge in case there's a merge conflict again until then, that way it'd go in the next time i rebase). thanks! |
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-4722-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 dfa1118eee84e2f54a304ba917885f98a571b23c
# Push it to GitHub
git push --set-upstream origin backport/backport-4722-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x Then, create a pull request where the |
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.3 2.3
# Navigate to the new working tree
cd .worktrees/backport-2.3
# Create a new branch
git switch --create backport/backport-4722-to-2.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 dfa1118eee84e2f54a304ba917885f98a571b23c
# Push it to GitHub
git push --set-upstream origin backport/backport-4722-to-2.3
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.3 Then, create a pull request where the |
thanks for merging, @reta! should i take care of the backports or will you do this? |
Thanks to you @rursprung , if you could take care of backports - would be great, but I am ready to back you up here if you need |
* add missing no-jdk gradle targets for distributions by convention all supported platforms should also have a gradle target to produce a no-jdk build and that target should be called `no-jdk-[platform]`. this is a first step in the path to publishing the no-jdk distributions as part of the release, as there are use-cases where a specific JDK should be used instead of the packaged one and it's cleaner to use a small distribution which doesn't bring along an unneeded JDK (the JDK greatly increases the resulting distribution since). note that i failed to rename the `linux-s390x` target, it seems that there's too much generic build code out there which tries to stitch together that name and then fails if it doesn't find it. this is part of opensearch-build#99. Signed-off-by: Ralph Ursprung <[email protected]> * add basic README for `:distribution` this is primarily to document the JDK & No JDK setup (to codify it for the future), however the README can be extended in the future to document more information which is currently hidden away only somewhere in the code. Signed-off-by: Ralph Ursprung <[email protected]> Signed-off-by: Ralph Ursprung <[email protected]> (cherry picked from commit dfa1118)
i've done the backport to 2.x, see #4884. i don't think that this is needed for 2.3.x as it's not something that needs to land in a patch release. WDYT? |
Thanks @rursprung, yeah, for features we don't have hard "must backport" requirement, I think this is just nice one to have and easy to backport, I can do that on your behalf. |
i think it muddies the water if we backport features to bugfix branches - these should IMHO contain as few commits as possible (i.e. only the actual bugfixes). otherwise it's also not proper semver if all features are also backported to a minor release (then why even bother having 2.x and 2.3 as separate branches if they both get the same set of commits?) |
No, we don't backport everything for sure (bugfix are exceptions), but let say we would need to release next 2.3.x patch (as of now, this is the latest releasable branch, 2.x is the next release which will happen in the future), in this case we could just bundle this (and potentially other backported features) for the users to benefit from (many are reluctant to go with major updates for a while, so delievering features in the patch releases is the way to go here). |
* add missing no-jdk gradle targets for distributions by convention all supported platforms should also have a gradle target to produce a no-jdk build and that target should be called `no-jdk-[platform]`. this is a first step in the path to publishing the no-jdk distributions as part of the release, as there are use-cases where a specific JDK should be used instead of the packaged one and it's cleaner to use a small distribution which doesn't bring along an unneeded JDK (the JDK greatly increases the resulting distribution since). note that i failed to rename the `linux-s390x` target, it seems that there's too much generic build code out there which tries to stitch together that name and then fails if it doesn't find it. this is part of opensearch-build#99. Signed-off-by: Ralph Ursprung <[email protected]> * add basic README for `:distribution` this is primarily to document the JDK & No JDK setup (to codify it for the future), however the README can be extended in the future to document more information which is currently hidden away only somewhere in the code. Signed-off-by: Ralph Ursprung <[email protected]> Signed-off-by: Ralph Ursprung <[email protected]> (cherry picked from commit dfa1118)
* add missing no-jdk gradle targets for distributions by convention all supported platforms should also have a gradle target to produce a no-jdk build and that target should be called `no-jdk-[platform]`. this is a first step in the path to publishing the no-jdk distributions as part of the release, as there are use-cases where a specific JDK should be used instead of the packaged one and it's cleaner to use a small distribution which doesn't bring along an unneeded JDK (the JDK greatly increases the resulting distribution since). note that i failed to rename the `linux-s390x` target, it seems that there's too much generic build code out there which tries to stitch together that name and then fails if it doesn't find it. this is part of opensearch-build#99. Signed-off-by: Ralph Ursprung <[email protected]> * add basic README for `:distribution` this is primarily to document the JDK & No JDK setup (to codify it for the future), however the README can be extended in the future to document more information which is currently hidden away only somewhere in the code. Signed-off-by: Ralph Ursprung <[email protected]> Signed-off-by: Ralph Ursprung <[email protected]>
Description
please see the individual commit messages for details.
Issues Resolved
part of opensearch-project/opensearch-build#99
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.