Dan Korostelev 5 years ago
parent
commit
c7bec0aa14
2 changed files with 38 additions and 67 deletions
  1. 0 29
      .github/workflows/main.yml
  2. 38 38
      tests/runci/targets/Js.hx

+ 0 - 29
.github/workflows/main.yml

@@ -43,24 +43,6 @@ jobs:
           ldd -v ./haxe
           ldd -v ./haxe
           ldd -v ./haxelib
           ldd -v ./haxelib
 
 
-      - name: Build xmldoc
-        run: |
-          set -ex
-          make -s xmldoc
-          cat >extra/doc/info.json <<EOL
-            {
-              "commit": "$GITHUB_SHA",
-              "branch": "$GITHUB_REF"
-            }
-          EOL
-
-      - name: Upload artifact
-        uses: actions/[email protected]
-        with:
-          name: linuxBinaries
-          path: out
-
-
   linux-test:
   linux-test:
     needs: linux-build
     needs: linux-build
     runs-on: ubuntu-latest
     runs-on: ubuntu-latest
@@ -74,17 +56,6 @@ jobs:
         target: [js]
         target: [js]
         include:
         include:
           - target: js
           - target: js
-            # SAUCE: 1
-            # SAUCE_TUNNEL_ID: 'linux-test'
-            # SAUCE_BUILD: '${{env.GITHUB_RUN_NUMBER}}' # $(Build.BuildNumber)
-          - target: hl
-            APT_PACKAGES: cmake ninja-build libturbojpeg-dev
-          - target: cpp
-            APT_PACKAGES: gcc-multilib g++-multilib
-          - target: lua
-            APT_PACKAGES: ncurses-dev
-          - target: flash9
-            APT_PACKAGES: libglib2.0 libfreetype6 xvfb
     steps:
     steps:
       - uses: actions/checkout@master
       - uses: actions/checkout@master
         with:
         with:

+ 38 - 38
tests/runci/targets/Js.hx

@@ -61,44 +61,44 @@ class Js {
 		// runCommand("haxe", ["run.hxml"]);
 		// runCommand("haxe", ["run.hxml"]);
 
 
 		haxelibInstallGit("HaxeFoundation", "hxnodejs");
 		haxelibInstallGit("HaxeFoundation", "hxnodejs");
-		var env = Sys.environment();
-		if (
-			env.exists("SAUCE") &&
-			env.exists("SAUCE_USERNAME") &&
-			env.exists("SAUCE_ACCESS_KEY")
-		) {
-			var sc = switch (ci) {
-				case AzurePipelines:
-					var scVersion = "sc-4.5.3-linux";
-					runCommand("wget", ["-q", 'https://saucelabs.com/downloads/${scVersion}.tar.gz'], true);
-					runCommand("tar", ["-xf", '${scVersion}.tar.gz']);
-
-					//start sauce-connect
-					var scReadyFile = "sauce-connect-ready-" + Std.random(100);
-					var p = new Process('${scVersion}/bin/sc', [
-						"-i", Sys.getEnv("SAUCE_TUNNEL_ID"),
-						"-f", scReadyFile
-					]);
-					while(!FileSystem.exists(scReadyFile)) {
-						Sys.sleep(0.5);
-					}
-					p;
-				case _:
-					// sauce-connect should have been started
-					null;
-			}
-
-			changeDirectory(unitDir);
-			runCommand("npm", ["install", "wd", "q"], true);
-			runCommand("haxe", ["compile-saucelabs-runner.hxml"]);
-			var server = new Process("nekotools", ["server"]);
-			runCommand("node", ["bin/RunSauceLabs.js"].concat([for (js in jsOutputs) "unit-js.html?js=" + js.urlEncode()]));
-
-			server.close();
-
-			if (sc != null)
-				sc.close();
-		}
+		// var env = Sys.environment();
+		// if (
+		// 	env.exists("SAUCE") &&
+		// 	env.exists("SAUCE_USERNAME") &&
+		// 	env.exists("SAUCE_ACCESS_KEY")
+		// ) {
+		// 	var sc = switch (ci) {
+		// 		case AzurePipelines:
+		// 			var scVersion = "sc-4.5.3-linux";
+		// 			runCommand("wget", ["-q", 'https://saucelabs.com/downloads/${scVersion}.tar.gz'], true);
+		// 			runCommand("tar", ["-xf", '${scVersion}.tar.gz']);
+
+		// 			//start sauce-connect
+		// 			var scReadyFile = "sauce-connect-ready-" + Std.random(100);
+		// 			var p = new Process('${scVersion}/bin/sc', [
+		// 				"-i", Sys.getEnv("SAUCE_TUNNEL_ID"),
+		// 				"-f", scReadyFile
+		// 			]);
+		// 			while(!FileSystem.exists(scReadyFile)) {
+		// 				Sys.sleep(0.5);
+		// 			}
+		// 			p;
+		// 		case _:
+		// 			// sauce-connect should have been started
+		// 			null;
+		// 	}
+
+		// 	changeDirectory(unitDir);
+		// 	runCommand("npm", ["install", "wd", "q"], true);
+		// 	runCommand("haxe", ["compile-saucelabs-runner.hxml"]);
+		// 	var server = new Process("nekotools", ["server"]);
+		// 	runCommand("node", ["bin/RunSauceLabs.js"].concat([for (js in jsOutputs) "unit-js.html?js=" + js.urlEncode()]));
+
+		// 	server.close();
+
+		// 	if (sc != null)
+		// 		sc.close();
+		// }
 
 
 		// infoMsg("Test optimization:");
 		// infoMsg("Test optimization:");
 		// changeDirectory(optDir);
 		// changeDirectory(optDir);