hanzoai/pack
2
0
Fork 0
mirror of https://github.com/hanzoai/pack.git synced 2026-09-30 23:43:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Follow best practices, fix gradle test

Browse Source
This commit is contained in:
Aleks Rutins
2025-03-05 20:23:18 -05:00
parent 402b03400d
commit 5d0204f7ee
5 changed files with 59 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/providers/java/java.go
+20 -5
View File
@@ -26,14 +26,14 @@ func (p *JavaProvider) StartCommandHelp() string {
}
func (p *JavaProvider) Plan(ctx *generate.GenerateContext) error {
p.installJDK(ctx)
build := ctx.NewCommandStep("build")
build.AddCommand(plan.NewCopyCommand("."))
build.Inputs = []plan.Input{plan.NewStepInput(ctx.GetMiseStepBuilder().Name())}
if p.usesGradle(ctx) {
p.installGradle(ctx)
p.setGradleVersion(ctx)
p.setJDKVersion(ctx, nil)
if ctx.App.HasMatch("gradlew") && !ctx.App.IsFileExecutable("gradlew") {
build.AddCommand(plan.NewExecCommand("chmod +x gradlew"))
@@ -43,6 +43,7 @@ func (p *JavaProvider) Plan(ctx *generate.GenerateContext) error {
build.AddCache(p.gradleCache(ctx))
} else {
ctx.GetMiseStepBuilder().Default("maven", "latest")
p.setJDKVersion(ctx, nil)
if ctx.App.HasMatch("mvnw") && !ctx.App.IsFileExecutable("mvnw") {
build.AddCommand(plan.NewExecCommand("chmod +x mvnw"))
@@ -51,9 +52,23 @@ func (p *JavaProvider) Plan(ctx *generate.GenerateContext) error {
build.AddCommand(plan.NewExecCommand(fmt.Sprintf("%s -DoutputFile=target/mvn-dependency-list.log -B -DskipTests clean dependency:list install", p.getMavenExe(ctx))))
}
runtimeDeps := ctx.NewMiseStepBuilder("java-runtime-deps")
runtimeDeps.Inputs = []plan.Input{ctx.DefaultRuntimeInput()}
p.setJDKVersion(ctx, runtimeDeps)
outPath := "target/."
if ctx.App.HasMatch("*/build/libs/*.jar") {
outPath = "."
}
ctx.Deploy.Inputs = []plan.Input{
plan.NewStepInput(build.Name()),
plan.NewLocalInput("."),
ctx.DefaultRuntimeInput(),
plan.NewStepInput(runtimeDeps.Name(), plan.InputOptions{
Include: runtimeDeps.GetOutputPaths(),
}),
plan.NewStepInput(build.Name(), plan.InputOptions{
Include: []string{outPath},
}),
}
ctx.Deploy.StartCmd = p.getStartCmd(ctx)
@@ -63,7 +78,7 @@ func (p *JavaProvider) Plan(ctx *generate.GenerateContext) error {
func (p *JavaProvider) getStartCmd(ctx *generate.GenerateContext) string {
if p.usesGradle(ctx) {
buildGradle := p.readBuildGradle(ctx)
return fmt.Sprintf("java $JAVA_OPTS -jar %s $(ls -1 build/libs/*jar | grep -v plain)", getGradlePortConfig(buildGradle))
return fmt.Sprintf("java $JAVA_OPTS -jar %s $(ls -1 */build/libs/*jar | grep -v plain)", getGradlePortConfig(buildGradle))
} else if ctx.App.HasMatch("pom.xml") {
return fmt.Sprintf("java %s $JAVA_OPTS -jar target/*jar", getMavenPortConfig(ctx))
} else {