Make forbidden apis check cacheable and cc compatible #101217
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
breskeby
added
>enhancement
:Delivery/Build
|
Pinging @elastic/es-delivery (Team:Delivery) |
breskeby
force-pushed
the
improve-forbidden-apis-checks
branch
from
6a1f6e8 to
8ddbfee
Compare
breskeby
force-pushed
the
improve-forbidden-apis-checks
branch
from
f0c6a65 to
6c374c6
Compare
breskeby
commented
Oct 24, 2023
| @@ -88,8 +88,6 @@ public class DependencyLicensesTask extends DefaultTask { | |||
|
|
|||
| private final Logger logger = Logging.getLogger(getClass()); | |||
|
|
|||
| private static final String SHA_EXTENSION = ".sha1"; | |||
There was a problem hiding this comment.
not used; removed while been there
mark-vieira
approved these changes
Oct 24, 2023
| @@ -65,60 +52,36 @@ public TaskProvider<? extends Task> createTask(Project project) { | |||
| String sourceSetTaskName = sourceSet.getTaskName(FORBIDDEN_APIS_TASK_NAME, null); | |||
| var sourceSetTask = project.getTasks().register(sourceSetTaskName, CheckForbiddenApisTask.class, t -> { | |||
| t.setDescription("Runs forbidden-apis checks on '${sourceSet.name}' classes."); | |||
| t.setResourcesDir(resourcesDir); | |||
| t.getOutputs().upToDateWhen(Specs.SATISFIES_ALL); | |||
| t.setClassesDirs(sourceSet.getOutput().getClassesDirs()); | |||
| t.dependsOn(resourcesTask); | |||
| t.setClasspath(sourceSet.getRuntimeClasspath().plus(sourceSet.getCompileClasspath()).plus(sourceSet.getOutput())); | |||
There was a problem hiding this comment.
Why all the plus nonsense here? Shouldn't the runtime classpath include all that stuff?
There was a problem hiding this comment.
I recall I explicitly added the getOutput() to this quite a while ago. I don't recall why that is needed. The compileclasspath is required as we have a lot of compileOnly dependencies declared and we need those to run forbiddenapis check successfully.
breskeby
added
the
buildkite-opt-in
|
This work was related to #57918 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Also ported the implementation to use the gradle worker api that allows us to expand our parallalism of task execution within a single project. Example build scan: https://gradle-enterprise.elastic.co/s/non7hf532jrlg/timeline?sort=longest&type=org.elasticsearch.gradle.internal.precommit.CheckForbiddenApisTask