Skip to content

Commit b4fc218

Browse files
committed
Merge branch '3.2.x' into 3.3.x
2 parents 58968f2 + 72de717 commit b4fc218

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

buildSrc/src/main/java/org/springframework/boot/build/cli/HomebrewFormula.java

+12-1
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,12 @@
3636
import org.gradle.api.tasks.PathSensitivity;
3737
import org.gradle.api.tasks.TaskAction;
3838
import org.gradle.api.tasks.TaskExecutionException;
39+
import org.slf4j.Logger;
40+
import org.slf4j.LoggerFactory;
3941

4042
import org.springframework.boot.build.artifacts.ArtifactRelease;
43+
import org.springframework.boot.build.properties.BuildProperties;
44+
import org.springframework.boot.build.properties.BuildType;
4145

4246
/**
4347
* A {@link Task} for creating a Homebrew formula manifest.
@@ -46,16 +50,18 @@
4650
*/
4751
public abstract class HomebrewFormula extends DefaultTask {
4852

53+
private static final Logger logger = LoggerFactory.getLogger(HomebrewFormula.class);
54+
4955
private final FileSystemOperations fileSystemOperations;
5056

5157
@Inject
5258
public HomebrewFormula(FileSystemOperations fileSystemOperations) {
59+
this.fileSystemOperations = fileSystemOperations;
5360
Project project = getProject();
5461
MapProperty<String, Object> properties = getProperties();
5562
properties.put("hash", getArchive().map((archive) -> sha256(archive.getAsFile())));
5663
getProperties().put("repo", ArtifactRelease.forProject(project).getDownloadRepo());
5764
getProperties().put("version", project.getVersion().toString());
58-
this.fileSystemOperations = fileSystemOperations;
5965
}
6066

6167
private String sha256(File file) {
@@ -84,6 +90,11 @@ private String sha256(File file) {
8490

8591
@TaskAction
8692
void createFormula() {
93+
BuildType buildType = BuildProperties.get(getProject()).buildType();
94+
if (buildType != BuildType.OPEN_SOURCE) {
95+
logger.debug("Skipping Homebrew formula for non open source build type");
96+
return;
97+
}
8798
this.fileSystemOperations.copy((copy) -> {
8899
copy.from(getTemplate());
89100
copy.into(getOutputDir());

0 commit comments

Comments
 (0)