Skip to content

Commit e1d7368

Browse files
committed
remove lix
1 parent d83983c commit e1d7368

File tree

2 files changed

+0
-72
lines changed

2 files changed

+0
-72
lines changed

build/index.js

Lines changed: 0 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Main.hx

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -19,38 +19,19 @@ enum abstract TestLocation(String) from String
1919
final Git = "git";
2020
}
2121

22-
enum abstract HaxeVersion(String) from String to String
23-
{
24-
final Latest = "latest";
25-
final Stable = "stable";
26-
final Nightly = "nightly";
27-
// use the version already installed (no lix)
28-
final Current = "current";
29-
}
30-
3122
private final HaxelibRepo = Path.join([Sys.getEnv("HOME"), "haxe/haxelib"]);
3223

3324
function main()
3425
{
35-
final haxeVersion:HaxeVersion = Core.getInput("haxe-version");
3626
final limeVersion:LibVersion = Core.getInput("lime-version");
3727
final openflVersion:LibVersion = Core.getInput("openfl-version");
3828
final flixelVersions:LibVersion = Core.getInput("flixel-versions");
3929
final testLocation:TestLocation = Core.getInput("test-location");
4030
final target:Target = Core.getInput("target");
4131
final runTests:Bool = Core.getInput("run-tests") == "true";
4232

43-
if (runTests)
44-
{
45-
if (target == Hl && haxeVersion.startsWith("3"))
46-
{
47-
return; // OpenFL's HL target and Haxe 3 don't work together
48-
}
49-
}
50-
5133
Core.startGroup("Installing Haxe Dependencies");
5234
final installationResult = runUntilFailure([
53-
setupLix.bind(haxeVersion),
5435
run.bind("sudo add-apt-repository ppa:haxe/snapshots -y"), // for nekotools
5536
run.bind("sudo apt-get install --fix-missing"), // for nekotools
5637
run.bind("sudo apt-get upgrade"), // for nekotools
@@ -67,8 +48,6 @@ function main()
6748
Core.endGroup();
6849

6950
Core.startGroup("Listing Dependencies");
70-
if (haxeVersion != Current)
71-
run("lix -v");
7251
run("haxe -version");
7352
run("neko -version");
7453
run("haxelib version");
@@ -97,21 +76,6 @@ function main()
9776
}
9877
}
9978

100-
private function setupLix(haxeVersion):ExitCode
101-
{
102-
if (haxeVersion == Current)
103-
return Success;
104-
105-
Sys.command("lix scope");
106-
final path = Path.join([Sys.getEnv("HOME"), "haxe/.haxerc"]);
107-
if (!FileSystem.exists(path))
108-
{
109-
return Failure;
110-
}
111-
File.saveContent(path, '{"version": "stable", "resolveLibs": "haxelib"}');
112-
return run('lix install haxe $haxeVersion --global');
113-
}
114-
11579
private function installHaxelibs(limeVersion:LibVersion, openflVersion:LibVersion, flixelVersions:LibVersion):ExitCode
11680
{
11781
final libs = [

0 commit comments

Comments
 (0)