From abe1a67ad6bc7607c9d306324bc5050b7a92c088 Mon Sep 17 00:00:00 2001 From: George FunBook Date: Thu, 7 Mar 2024 12:37:08 -0600 Subject: [PATCH] -openfl-version +lime-version --- action.yml | 4 ++-- src/Main.hx | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/action.yml b/action.yml index 58b8fd0..800e589 100644 --- a/action.yml +++ b/action.yml @@ -7,8 +7,8 @@ inputs: haxe-version: description: 'Version of Haxe to install via lix' required: false - openfl-version: - description: 'Version of Openfl to use' + lime-version: + description: 'Version of Lime to use' required: false flixel-versions: description: 'Version of Flixel libs to use' diff --git a/src/Main.hx b/src/Main.hx index f1ba2bd..bf78795 100644 --- a/src/Main.hx +++ b/src/Main.hx @@ -12,7 +12,7 @@ enum abstract FlixelVersions(String) from String { final Release = "release"; } -enum abstract OpenFlVersion(String) from String { +enum abstract LimeVersion(String) from String { final Dev = "dev"; final Release = "release"; } @@ -34,7 +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 limeVersion:LimeVersion = Core.getInput("lime-version"); final flixelVersions:FlixelVersions = Core.getInput("flixel-versions"); final testLocation:TestLocation = Core.getInput("test-location"); final target:Target = Core.getInput("target"); @@ -106,7 +106,7 @@ private function setupLix(haxeVersion):ExitCode { return run('lix install haxe $haxeVersion --global'); } -private function installHaxelibs(openFlVersion:OpenFlVersion, flixelVersions:FlixelVersions):ExitCode { +private function installHaxelibs(limeVersion:LimeVersion, flixelVersions:FlixelVersions):ExitCode { // @formatter:off var libs = [ // TODO: fix git version failing on nightly @@ -124,11 +124,11 @@ private function installHaxelibs(openFlVersion:OpenFlVersion, flixelVersions:Fli Haxelib.git.bind("Geokureli", "spinehaxe", "spinehaxe", "haxe4.3.1"), Haxelib.git.bind("larsiusprime", "steamwrap"), - (openFlVersion == Dev - ? Haxelib.git.bind("openfl", "openfl") - : Haxelib.install.bind("openfl") + (limeVersion == Dev + ? Haxelib.git.bind("openfl", "lime") + : Haxelib.install.bind("lime") ), - Haxelib.install.bind("lime"), + Haxelib.install.bind("openfl"), ]; // @formatter:on libs = libs.concat(if (flixelVersions == Dev) {