Pass selected JDK to backend builds
This commit is contained in:
@@ -36,11 +36,13 @@ class DeployerTests(unittest.TestCase):
|
||||
[str(npm), "install"],
|
||||
Path("C:/project/web"),
|
||||
output.append,
|
||||
environment={"JAVA_HOME": str(Path.cwd() / "fake-jdk")},
|
||||
)
|
||||
|
||||
self.assertEqual(exit_code, 1)
|
||||
self.assertEqual(output, ["npm ERR! ⚠ dependency failed", "安装失败"])
|
||||
self.assertNotIn("text", popen_options)
|
||||
self.assertEqual(popen_options["env"]["JAVA_HOME"], str(Path.cwd() / "fake-jdk"))
|
||||
self.assertEqual(
|
||||
Path(popen_options["env"]["PATH"].split(os.pathsep)[0]),
|
||||
npm.parent,
|
||||
@@ -633,21 +635,29 @@ class DeployerTests(unittest.TestCase):
|
||||
root = Path(temp)
|
||||
backend = root / "server"
|
||||
maven = root / "tools" / "apache-maven" / "bin" / "mvn.cmd"
|
||||
jdk_bin = root / "tools" / "jdk8" / "bin"
|
||||
java = jdk_bin / "java.exe"
|
||||
javac = jdk_bin / "javac.exe"
|
||||
backend.mkdir()
|
||||
maven.parent.mkdir(parents=True)
|
||||
jdk_bin.mkdir(parents=True)
|
||||
(backend / "pom.xml").write_text("<project />", encoding="utf-8")
|
||||
maven.write_text("", encoding="utf-8")
|
||||
java.write_text("", encoding="utf-8")
|
||||
javac.write_text("", encoding="utf-8")
|
||||
scan = ScanResult(
|
||||
root=root,
|
||||
backend=ProjectComponent("Spring Boot", backend, "Maven project"),
|
||||
frontend=None,
|
||||
sql_files=[],
|
||||
)
|
||||
config = DeploymentConfig(tool_paths={"Maven": maven})
|
||||
config = DeploymentConfig(tool_paths={"Maven": maven, "JDK": java})
|
||||
|
||||
plan = build_deployment_plan(scan, config)
|
||||
|
||||
self.assertEqual(plan[0].command, [str(maven), "clean", "package", "-DskipTests"])
|
||||
self.assertEqual(plan[0].environment["JAVA_HOME"], str(jdk_bin.parent))
|
||||
self.assertEqual(Path(plan[0].environment["PATH"].split(os.pathsep)[0]), jdk_bin)
|
||||
|
||||
def test_deploys_ssm_war_to_configured_tomcat(self):
|
||||
with TemporaryDirectory() as temp:
|
||||
|
||||
Reference in New Issue
Block a user