-
Notifications
You must be signed in to change notification settings - Fork 2.7k
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
Don't include GraalVM dependencies in lib directory #28650
Don't include GraalVM dependencies in lib directory #28650
Conversation
@@ -429,6 +430,9 @@ private static boolean includeAppDep(ResolvedDependency appDep, Optional<Set<Art | |||
if (!appDep.isJar()) { | |||
return false; | |||
} | |||
if (appDep.getGroupId().equals("org.graalvm.nativeimage") || appDep.getGroupId().equals("org.graalvm.sdk")) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need to only do this for a specific GraalVM version or will this work for all versions we support?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It should work for all versions.
- Tested with 23.0-dev in https://github.com/graalvm/mandrel/actions/runs/3269063301
- And being tested with 22.2 in this PR.
- 22.3 should be no different.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks!
This comment has been minimized.
This comment has been minimized.
I see a lot of timeout errors in the JVM tests. I don't see how these could relate to this change, but I am also hesitant to believe it's coincidence. Should we re-run the tests? (Update: nevermind I can do it myself :) ) |
Yeah, best re-run them |
This comment has been minimized.
This comment has been minimized.
It seems like the test failures are genuine |
8d5ddbd
to
2b28b05
Compare
Yes, apparently there are some dependencies on graal-sdk in JVM mode. I altered the PR to only skip the dependencies in native builds. New CI run with oracle/graal#5232 : https://github.com/graalvm/mandrel/actions/runs/3273144262 |
0c57ee7
to
574645b
Compare
574645b
to
2ae0c0e
Compare
@zakkak is it required for GraalVM 22.3 (and so should be backported) or is it 22.4+? |
No, this will only be required for GraalVM 23.0 (there will be no 22.4 it goes up to YY.3, i.e. four releases per year) |
} | ||
List<String> removedArtifacts = classLoadingConfig.removedArtifacts.get(); | ||
removedArtifacts.add("org.graalvm.nativeimage:svm"); | ||
removedArtifacts.add("org.graalvm.sdk:graal-sdk"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can't say I'm excited about us actually updating the config. But I suppose it shouldn't be a huge problem in practice.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I went this way to reuse the existing code and avoid introducing more parameters and checks that would essentially do the same thing. As this is not urgent please let me know if you can think of any better alternatives.
Failing Jobs - Building 2ae0c0e
Full information is available in the Build summary check run. Failures⚙️ JVM Tests - JDK 11 Windows #- Failing: extensions/opentelemetry/deployment
! Skipped: integration-tests/micrometer-prometheus integration-tests/opentelemetry integration-tests/opentelemetry-grpc and 5 more 📦 extensions/opentelemetry/deployment✖
⚙️ JVM Tests - JDK 17 MacOS M1 #- Failing: extensions/vertx/deployment
! Skipped: extensions/agroal/deployment extensions/amazon-lambda-http/deployment extensions/amazon-lambda-rest/deployment and 340 more 📦 extensions/vertx/deployment✖
|
Test failures seem unrelated to the PR. @gsmet we would need a fix sooner than later since oracle/graal#5232 is now merged upstream and is causing CI failures (when testing with 23.0-dev), please advise on how to proceed. |
Yes, please. Our integration tests are all red because of this and are at risk of missing other breakage because of it. |
I merged it. |
Thank you! |
In preparation for oracle/graal#5232
Since GraalVM dependencies are provided by GraalVM itself there is no need to include them in the lib directory of thin jars or in uber jars.
Supersedes #28647
CI run: https://github.com/graalvm/mandrel/actions/runs/3269063301