Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.2.x' into 3.3.x

Browse Source 
Closes gh-42793
This commit is contained in:
Phillip Webb
2024-10-18 10:59:48 -07:00
parent 223886ff37 a45844e7cd
commit 8d028aa55f
2 changed files with 62 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
buildSrc/src/main/java/org/springframework/boot/build/test/DockerTestPlugin.java
View File

@@ -18,10 +18,12 @@ package org.springframework.boot.build.test;
import org.gradle.api.Plugin;
import org.gradle.api.Project;
import org.gradle.api.Task;
import org.gradle.api.plugins.JavaPlugin;
import org.gradle.api.plugins.JavaPluginExtension;
import org.gradle.api.provider.Provider;
import org.gradle.api.services.BuildService;
import org.gradle.api.tasks.Exec;
import org.gradle.api.tasks.SourceSet;
import org.gradle.api.tasks.SourceSetContainer;
import org.gradle.api.tasks.testing.Test;
@@ -43,17 +45,19 @@ public class DockerTestPlugin implements Plugin<Project> {
/**
* Name of the {@code dockerTest} task.
*/
public static String DOCKER_TEST_TASK_NAME = "dockerTest";
public static final String DOCKER_TEST_TASK_NAME = "dockerTest";
/**
* Name of the {@code dockerTest} source set.
*/
public static String DOCKER_TEST_SOURCE_SET_NAME = "dockerTest";
public static final String DOCKER_TEST_SOURCE_SET_NAME = "dockerTest";
/**
* Name of the {@code dockerTest} shared service.
*/
public static String DOCKER_TEST_SERVICE_NAME = "dockerTest";
public static final String DOCKER_TEST_SERVICE_NAME = "dockerTest";
private static final String RECLAIM_DOCKER_SPACE_TASK_NAME = "reclaimDockerSpace";
@Override
public void apply(Project project) {
@@ -73,6 +77,8 @@ public class DockerTestPlugin implements Plugin<Project> {
});
project.getDependencies()
.add(dockerTestSourceSet.getRuntimeOnlyConfigurationName(), "org.junit.platform:junit-platform-launcher");
Provider<Exec> reclaimDockerSpace = createReclaimDockerSpaceTask(project, buildService);
project.getTasks().getByName(LifecycleBasePlugin.CHECK_TASK_NAME).dependsOn(reclaimDockerSpace);
}
private SourceSet createSourceSet(Project project) {
@@ -110,4 +116,28 @@ public class DockerTestPlugin implements Plugin<Project> {
});
}
private Provider<Exec> createReclaimDockerSpaceTask(Project project,
Provider<DockerTestBuildService> buildService) {
return project.getTasks().register(RECLAIM_DOCKER_SPACE_TASK_NAME, Exec.class, (task) -> {
task.usesService(buildService);
task.setGroup(LifecycleBasePlugin.VERIFICATION_GROUP);
task.setDescription("Reclaims Docker space on CI.");
task.shouldRunAfter(DOCKER_TEST_TASK_NAME);
task.onlyIf(this::shouldReclaimDockerSpace);
task.executable("bash");
task.args("-c",
project.getRootDir()
.toPath()
.resolve(".github/scripts/reclaim-docker-diskspace.sh")
.toAbsolutePath());
});
}
private boolean shouldReclaimDockerSpace(Task task) {
if (System.getProperty("os.name").startsWith("Windows")) {
return false;
}
return System.getenv("GITHUB_ACTIONS") != null || System.getenv("RECLAIM_DOCKER_SPACE") != null;
}
}