Skip to content
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

Jump to bottom

Fix 1.5.0 regression in JLinkPLugin error handling #1285

Merged
merged 2 commits into from
Nov 23, 2019
Merged

Fix 1.5.0 regression in JLinkPLugin error handling #1285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab3cd43
Add a test for #1284
nigredo-tori Nov 22, 2019
45296e0
Update tool-launcher
nigredo-tori Nov 22, 2019
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
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ libraryDependencies ++= Seq(
// for jdkpackager
"org.apache.ant" % "ant" % "1.10.5",
// workaround for the command line size limit
"com.github.eldis" % "tool-launcher" % "0.2.1",
"com.github.eldis" % "tool-launcher" % "0.2.2",
"org.scalatest" %% "scalatest" % "3.0.5" % Test
)

Expand Down
9 changes: 9 additions & 0 deletions src/sbt-test/jlink/test-jlink-misc/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import scala.sys.process.Process
import com.typesafe.sbt.packager.Compat._

val runChecks = taskKey[Unit]("Run checks for a specific issue")
val runFailingChecks = taskKey[Unit]("Run checks for a specific issue, expecting them to fail")

// Exclude Scala by default to simplify the test.
autoScalaLibrary in ThisBuild := false
Expand Down Expand Up @@ -80,3 +81,11 @@ val issue1266 = project

runChecks := jlinkBuildImage.value
)

// Should fail for invalid jlink inputs
val issue1284 = project
.enablePlugins(JlinkPlugin)
.settings(
jlinkModules := List("no-such-module"),
runFailingChecks := jlinkBuildImage.value
)
3 changes: 2 additions & 1 deletion src/sbt-test/jlink/test-jlink-misc/test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@
> issue1247BadAutoModuleName/runChecks
> issue1247ExternalModule/runChecks
> issue1247JakartaJavaModules/runChecks
> issue1266/runChecks
> issue1266/runChecks
-> issue1284/runFailingChecks