From 0c25f6c514ed0357c3200666f716c2519d902500 Mon Sep 17 00:00:00 2001 From: George FunBook Date: Wed, 6 Mar 2024 15:37:00 -0600 Subject: [PATCH 1/2] add openfl-version --- action.yml | 7 ++-- build/index.js | 97 ++++++++++++++++++++++++++++++-------------------- src/Main.hx | 17 ++++++--- 3 files changed, 77 insertions(+), 44 deletions(-) diff --git a/action.yml b/action.yml index 07eb006..58b8fd0 100644 --- a/action.yml +++ b/action.yml @@ -5,8 +5,11 @@ branding: color: 'blue' inputs: haxe-version: - description: 'Version of Haxe to use' - required: true + description: 'Version of Haxe to install via lix' + required: false + openfl-version: + description: 'Version of Openfl to use' + required: false flixel-versions: description: 'Version of Flixel libs to use' required: true diff --git a/build/index.js b/build/index.js index 10d890f..6e0d36b 100644 --- a/build/index.js +++ b/build/index.js @@ -3116,6 +3116,7 @@ class js_Boot { js_Boot.__name__ = true; function Main_main() { let haxeVersion = actions_Core.getInput("haxe-version"); + let openFlVersion = actions_Core.getInput("openfl-version"); let flixelVersions = actions_Core.getInput("flixel-versions"); let testLocation = actions_Core.getInput("test-location"); let target = actions_Core.getInput("target"); @@ -3128,7 +3129,7 @@ function Main_main() { actions_Core.startGroup("Installing Haxe Dependencies"); let haxeVersion1 = haxeVersion; let cmd = "sudo apt install neko"; - let cmd1 = "haxelib install haxelib 4.0.3"; + let openFlVersion1 = openFlVersion; let flixelVersions1 = flixelVersions; let target1 = target; if(Command_runUntilFailure([function() { @@ -3136,9 +3137,7 @@ function Main_main() { },function() { return Command_run(cmd); },function() { - return Command_run(cmd1); - },function() { - return Main_installHaxelibs(flixelVersions1); + return Main_installHaxelibs(openFlVersion1,flixelVersions1); },function() { return Main_installHxcpp(target1); }]) != 0) { @@ -3184,65 +3183,87 @@ function Main_setupLix(haxeVersion) { js_node_Fs.writeFileSync(path,"{\"version\": \"stable\", \"resolveLibs\": \"haxelib\"}"); return Command_run("lix install haxe " + haxeVersion + " --global"); } -function Main_installHaxelibs(flixelVersions) { +function Main_installHaxelibs(openFlVersion,flixelVersions) { let user = "GeoKureli"; let haxelib = "munit"; let githubLib = "MassiveUnit"; let branch = "haxe4-3"; let path = "src"; + let libs = function() { + return Haxelib_git(user,haxelib,githubLib,branch,path); + }; let user1 = "GeoKureli"; let haxelib1 = "hamcrest"; let githubLib1 = "hamcrest-haxe"; let branch1 = "master"; let path1 = "src"; + let libs1 = function() { + return Haxelib_git(user1,haxelib1,githubLib1,branch1,path1); + }; let lib = "systools"; + let libs2 = function() { + return Haxelib_install(lib); + }; let lib1 = "task"; + let libs3 = function() { + return Haxelib_install(lib1); + }; let lib2 = "poly2trihx"; + let libs4 = function() { + return Haxelib_install(lib2); + }; let lib3 = "nape-haxe4"; + let libs5 = function() { + return Haxelib_install(lib3); + }; let lib4 = "haxeui-core"; + let libs6 = function() { + return Haxelib_install(lib4); + }; let lib5 = "haxeui-flixel"; + let libs7 = function() { + return Haxelib_install(lib5); + }; let user2 = "HaxeFoundation"; let haxelib2 = "hscript"; + let libs8 = function() { + return Haxelib_git(user2,haxelib2); + }; let user3 = "larsiusprime"; let haxelib3 = "firetongue"; + let libs9 = function() { + return Haxelib_git(user3,haxelib3); + }; let user4 = "Geokureli"; let haxelib4 = "spinehaxe"; let githubLib2 = "spinehaxe"; let branch2 = "haxe4.3.1"; + let libs10 = function() { + return Haxelib_git(user4,haxelib4,githubLib2,branch2); + }; let user5 = "larsiusprime"; let haxelib5 = "steamwrap"; - let lib6 = "openfl"; - let lib7 = "lime"; - let libs = [function() { - return Haxelib_git(user,haxelib,githubLib,branch,path); - },function() { - return Haxelib_git(user1,haxelib1,githubLib1,branch1,path1); - },function() { - return Haxelib_install(lib); - },function() { - return Haxelib_install(lib1); - },function() { - return Haxelib_install(lib2); - },function() { - return Haxelib_install(lib3); - },function() { - return Haxelib_install(lib4); - },function() { - return Haxelib_install(lib5); - },function() { - return Haxelib_git(user2,haxelib2); - },function() { - return Haxelib_git(user3,haxelib3); - },function() { - return Haxelib_git(user4,haxelib4,githubLib2,branch2); - },function() { + let libs11 = function() { return Haxelib_git(user5,haxelib5); - },function() { + }; + let libs12; + if(openFlVersion == "dev") { + let user = "openfl"; + let haxelib = "openfl"; + libs12 = function() { + return Haxelib_git(user,haxelib); + }; + } else { + let lib = "openfl"; + libs12 = function() { + return Haxelib_install(lib); + }; + } + let lib6 = "lime"; + let libs13 = [libs,libs1,libs2,libs3,libs4,libs5,libs6,libs7,libs8,libs9,libs10,libs11,libs12,function() { return Haxelib_install(lib6); - },function() { - return Haxelib_install(lib7); }]; - let libs1; + let libs14; if(flixelVersions == "dev") { let user = "HaxeFlixel"; let haxelib = "flixel"; @@ -3256,7 +3277,7 @@ function Main_installHaxelibs(flixelVersions) { let haxelib4 = "flixel-addons"; let user5 = "HaxeFlixel"; let haxelib5 = "flixel-ui"; - libs1 = [function() { + libs14 = [function() { return Haxelib_git(user,haxelib); },function() { return Haxelib_git(user1,haxelib1); @@ -3276,7 +3297,7 @@ function Main_installHaxelibs(flixelVersions) { let lib3 = "flixel-demos"; let lib4 = "flixel-addons"; let lib5 = "flixel-ui"; - libs1 = [function() { + libs14 = [function() { return Haxelib_install(lib); },function() { return Haxelib_install(lib1); @@ -3290,8 +3311,8 @@ function Main_installHaxelibs(flixelVersions) { return Haxelib_install(lib5); }]; } - libs = libs.concat(libs1); - return Command_runUntilFailure(libs); + libs13 = libs13.concat(libs14); + return Command_runUntilFailure(libs13); } function Main_installHxcpp(target) { if(target != "cpp") { diff --git a/src/Main.hx b/src/Main.hx index d93efd3..d894cd5 100644 --- a/src/Main.hx +++ b/src/Main.hx @@ -12,6 +12,11 @@ enum abstract FlixelVersions(String) from String { final Release = "release"; } +enum abstract OpenFlVersion(String) from String { + final Dev = "dev"; + final Release = "release"; +} + enum abstract TestLocation(String) from String { final Local = "local"; final Git = "git"; @@ -29,6 +34,7 @@ private final HaxelibRepo = Path.join([Sys.getEnv("HOME"), "haxe/haxelib"]); function main() { final haxeVersion:HaxeVersion = Core.getInput("haxe-version"); + final openFlVersion:OpenFlVersion = Core.getInput("openfl-version"); final flixelVersions:FlixelVersions = Core.getInput("flixel-versions"); final testLocation:TestLocation = Core.getInput("test-location"); final target:Target = Core.getInput("target"); @@ -45,7 +51,7 @@ function main() { setupLix.bind(haxeVersion), run.bind("sudo apt install neko"), // for nekotools // run.bind("haxelib install haxelib 4.0.3"), // 4.1.0 is failing on unit tests - installHaxelibs.bind(flixelVersions), + installHaxelibs.bind(openFlVersion, flixelVersions), installHxcpp.bind(target) ]); if (installationResult != Success) { @@ -97,7 +103,7 @@ private function setupLix(haxeVersion):ExitCode { return run('lix install haxe $haxeVersion --global'); } -private function installHaxelibs(flixelVersions):ExitCode { +private function installHaxelibs(openFlVersion:OpenFlVersion, flixelVersions:FlixelVersions):ExitCode { // @formatter:off var libs = [ // TODO: fix git version failing on nightly @@ -114,8 +120,11 @@ private function installHaxelibs(flixelVersions):ExitCode { Haxelib.git.bind("larsiusprime", "firetongue"), Haxelib.git.bind("Geokureli", "spinehaxe", "spinehaxe", "haxe4.3.1"), Haxelib.git.bind("larsiusprime", "steamwrap"), - - Haxelib.install.bind("openfl"), + + (openFlVersion == Dev + ? Haxelib.git.bind("openfl", "openfl") + : Haxelib.install.bind("openfl") + ), Haxelib.install.bind("lime"), ]; // @formatter:on From 82d80e47264335dc856c9ca6f6188ab61be27563 Mon Sep 17 00:00:00 2001 From: George FunBook Date: Wed, 6 Mar 2024 15:41:27 -0600 Subject: [PATCH 2/2] rebuild --- build/index.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/build/index.js b/build/index.js index 373fe4b..effd47a 100644 --- a/build/index.js +++ b/build/index.js @@ -2811,7 +2811,7 @@ module.exports = require("util"); var __webpack_exports__ = {}; // This entry need to be wrapped in an IIFE because it need to be isolated against other modules in the chunk. (() => { -// Generated by Haxe 4.3.3 +// Generated by Haxe 4.3.1 (function ($global) { "use strict"; function Command_runInDir(dir,cmd,args) { let cmd1 = cmd; @@ -3128,7 +3128,10 @@ function Main_main() { } actions_Core.startGroup("Installing Haxe Dependencies"); let haxeVersion1 = haxeVersion; - let cmd = "sudo apt install neko"; + let cmd = "sudo add-apt-repository ppa:haxe/snapshots -y"; + let cmd1 = "sudo apt-get install --fix-missing"; + let cmd2 = "sudo apt-get upgrade"; + let cmd3 = "sudo apt-get install neko -y"; let openFlVersion1 = openFlVersion; let flixelVersions1 = flixelVersions; let target1 = target; @@ -3136,6 +3139,12 @@ function Main_main() { return Main_setupLix(haxeVersion1); },function() { return Command_run(cmd); + },function() { + return Command_run(cmd1); + },function() { + return Command_run(cmd2); + },function() { + return Command_run(cmd3); },function() { return Main_installHaxelibs(openFlVersion1,flixelVersions1); },function() {