Skip to content

Commit

Permalink
Merge pull request #10 from HaxeFlixel/openfl-dev
Browse files Browse the repository at this point in the history
add openfl-version
  • Loading branch information
Geokureli authored Mar 6, 2024
2 parents a4439db + 82d80e4 commit b975cbb
Show file tree
Hide file tree
Showing 3 changed files with 78 additions and 42 deletions.
7 changes: 5 additions & 2 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
96 changes: 60 additions & 36 deletions build/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 13 additions & 4 deletions src/Main.hx
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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");
Expand All @@ -48,7 +54,7 @@ function main() {
run.bind("sudo apt-get upgrade"), // for nekotools
run.bind("sudo apt-get install neko -y"), // 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) {
Expand Down Expand Up @@ -100,7 +106,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
Expand All @@ -117,8 +123,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
Expand Down

0 comments on commit b975cbb

Please sign in to comment.