Skip to content

Fix compile cache artifact escalation #498

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.

Sign up for GitHub

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

Open
tfactor2 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix compile cache artifact escalation #498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions src/main/java/org/apache/maven/buildcache/BuildCacheMojosExecutionStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,18 @@ private CacheRestorationStatus restoreProject(
final Build build = cacheResult.getBuildInfo();
final MavenProject project = cacheResult.getContext().getProject();
final MavenSession session = cacheResult.getContext().getSession();
final String highestRequestPhase = lifecyclePhasesHelper.resolveHighestLifecyclePhase(project, mojoExecutions);

if (requiresPackagedArtifact(highestRequestPhase)
&& buildStoresDirectoryAsMainArtifact(build)
&& !lifecyclePhasesHelper.isLaterPhaseThanBuild("package", build)) {
LOGGER.info(
"Cached build for {} cannot satisfy requested {} phase because the main artifact is stored as a directory",
getVersionlessProjectKey(project),
highestRequestPhase);
return CacheRestorationStatus.FAILURE;
}

final List<MojoExecution> cachedSegment =
lifecyclePhasesHelper.getCachedSegment(project, mojoExecutions, build);

Expand Down Expand Up @@ -333,6 +345,11 @@ private CacheRestorationStatus restoreProject(

// Execute mojos after the cache segment
LOGGER.debug("Execute mojos post cache segment");
if (shouldResetProjectArtifactForPackaging(build, highestRequestPhase) && project.getArtifact() != null) {
LOGGER.debug(
"Resetting project artifact file before package-or-later mojos after legacy directory-backed main artifact restoration");
project.getArtifact().setFile(null);
}
List<MojoExecution> postCachedSegment =
lifecyclePhasesHelper.getPostCachedSegment(project, mojoExecutions, build);
for (MojoExecution mojoExecution : postCachedSegment) {
Expand All @@ -341,6 +358,20 @@ private CacheRestorationStatus restoreProject(
return CacheRestorationStatus.SUCCESS;
}

private boolean shouldResetProjectArtifactForPackaging(Build build, String highestRequestPhase) {
return requiresPackagedArtifact(highestRequestPhase)
&& buildStoresDirectoryAsMainArtifact(build)
&& lifecyclePhasesHelper.isLaterPhaseThanBuild("package", build);
}

private boolean buildStoresDirectoryAsMainArtifact(Build build) {
return build.getArtifact() != null && build.getArtifact().isIsDirectory();
}

private boolean requiresPackagedArtifact(String lifecyclePhase) {
return "package".equals(lifecyclePhase) || lifecyclePhasesHelper.isLaterPhase(lifecyclePhase, "package");
}

private boolean verifyCacheConsistency(
MojoExecution cacheCandidate,
Build cachedBuild,
Expand Down
Loading
Loading