disable Java tests too

.github/workflows/main.yml

@@ -351,7 +351,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: [macro, js, hl, cpp, 'java,jvm', php, python, lua, flash, neko]
+        target: [macro, js, hl, cpp, 'jvm', php, python, lua, flash, neko]
         include:
           - target: hl
             APT_PACKAGES: cmake ninja-build libturbojpeg-dev
@@ -676,7 +676,7 @@ jobs:
       fail-fast: false
       matrix:
         # TODO enable lua after https://github.com/HaxeFoundation/haxe/issues/10919
-        target: [macro, js, hl, cpp, 'java,jvm', php, python, flash, neko]
+        target: [macro, js, hl, cpp, 'jvm', php, python, flash, neko]
     steps:
       - uses: actions/checkout@main
         with:
@@ -768,7 +768,7 @@ jobs:
       matrix:
         # TODO jvm: https://github.com/HaxeFoundation/haxe/issues/8601
         # TODO enable lua after https://github.com/HaxeFoundation/haxe/issues/10919
-        target: [macro, js, hl, cpp, java, php, python, flash, neko]
+        target: [macro, js, hl, cpp, php, python, flash, neko]
     steps:
       - uses: actions/checkout@main
         with:
@@ -857,7 +857,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: [macro, js, hl, cpp, 'java,jvm', php, python, flash, neko]
+        target: [macro, js, hl, cpp, 'jvm', php, python, flash, neko]
         include:
           - target: hl
             BREW_PACKAGES: ninja

tests/RunCi.hx

@@ -72,8 +72,6 @@ class RunCi {
 						runci.targets.Cpp.run(args, false, true);
 					case Js:
 						runci.targets.Js.run(args);
-					case Java:
-						runci.targets.Java.run(args);
 					case Jvm:
 						runci.targets.Jvm.run(args);
 					case Flash:

tests/runci/TestTarget.hx

@@ -9,7 +9,6 @@ enum abstract TestTarget(String) from String {
 	var Cpp = "cpp";
 	var Cppia = "cppia";
 	var Flash = "flash";
-	var Java = "java";
 	var Jvm = "jvm";
 	var Python = "python";
 	var Hl = "hl";

tests/runci/targets/Java.hx

@@ -1,52 +0,0 @@
-package runci.targets;
-
-import sys.FileSystem;
-import haxe.io.Path;
-import runci.System.*;
-import runci.Config.*;
-using StringTools;
-
-class Java {
-	static final miscJavaDir = getMiscSubDir('java');
-
-	static public function getJavaDependencies() {
-		haxelibInstallGit("HaxeFoundation", "hxjava", true);
-		runCommand("javac", ["-version"]);
-	}
-
-	static public function run(args:Array<String>) {
-		deleteDirectoryRecursively("bin/java");
-		getJavaDependencies();
-
-		runCommand("haxe", ["compile-java.hxml"].concat(args));
-		runCommand("java", ["-jar", "bin/java/TestMain-Debug.jar"]);
-
-		runCommand("haxe", ["compile-java.hxml","-dce","no"].concat(args));
-		runCommand("java", ["-jar", "bin/java/TestMain-Debug.jar"]);
-
-		changeDirectory(miscJavaDir);
-		runCommand("haxe", ["run.hxml"]);
-
-		changeDirectory(sysDir);
-		runCommand("haxe", ["compile-java.hxml"].concat(args));
-		runSysTest("java", ["-jar", "bin/java/Main-Debug.jar"]);
-
-		changeDirectory(threadsDir);
-		runCommand("haxe", ["build.hxml", "-java", "export/java"].concat(args));
-		runCommand("java", ["-jar", "export/java/Main.jar"]);
-
-		infoMsg("Testing java-lib extras");
-		changeDirectory(Path.join([unitDir, 'bin']));
-		final libTestDir = 'java-lib-tests';
-		if (!FileSystem.exists(libTestDir))
-			runNetworkCommand("git", ["clone", "https://github.com/waneck/java-lib-tests.git", "--depth", "1"]);
-
-		for (dir in FileSystem.readDirectory(libTestDir)) {
-			final path = Path.join([libTestDir, dir]);
-			if (FileSystem.isDirectory(path))
-				for (file in FileSystem.readDirectory(path))
-					if (file.endsWith('.hxml'))
-						runCommand("haxe", ["--cwd", path, file]);
-		}
-	}
-}

tests/runci/targets/Js.hx

@@ -121,7 +121,7 @@ class Js {
 		changeDirectory(optDir);
 		runCommand("haxe", ["run.hxml"]);
 
-		runci.targets.Java.getJavaDependencies(); // this is awkward
+		runci.targets.Jvm.getJavaDependencies(); // this is awkward
 		haxelibInstallGit("Simn", "haxeserver");
 		changeDirectory(serverDir);
 		runCommand("haxe", ["build.hxml"]);

tests/runci/targets/Jvm.hx

@@ -4,9 +4,14 @@ import runci.System.*;
 import runci.Config.*;
 
 class Jvm {
+	static public function getJavaDependencies() {
+		haxelibInstallGit("HaxeFoundation", "hxjava", true);
+		runCommand("javac", ["-version"]);
+	}
+
 	static public function run(args:Array<String>) {
 		deleteDirectoryRecursively("bin/jvm");
-		Java.getJavaDependencies();
+		getJavaDependencies();
 
 		for (level in 0...3) {
 			final args = args.concat(["-D", "jvm.dynamic-level=" + level]);