From a672f84501f9875a03bb78b4d74b22cbd06f4fb6 Mon Sep 17 00:00:00 2001 From: Reycko <78082869+Reycko@users.noreply.github.com> Date: Mon, 4 Mar 2024 17:49:51 +0100 Subject: [PATCH] Workflow fixes --- .github/workflows/main.yml | 7 +++---- source/psychlua/HScript.hx | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2894400ba18..c2396f291b6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,7 +28,7 @@ jobs: - uses: krdlab/setup-haxe@master with: - haxe-version: latest + haxe-version: 4.3.3 # Runs a set of commands using the runners shell - name: Install Haxelib run: | @@ -43,7 +43,6 @@ jobs: run: echo "${{github.run_id}}" > VERSION - name: Compile run: | - haxelib fixrepo haxelib run lime build Project.xml linux --app-version="4.0.0-${{ github.run_id}}" - name: Publish Artifact uses: actions/upload-artifact@v2.2.4 @@ -59,7 +58,7 @@ jobs: - uses: krdlab/setup-haxe@master with: - haxe-version: latest + haxe-version: 4.3.3 # Runs a set of commands using the runners shell - name: Install Haxelib run: | @@ -88,7 +87,7 @@ jobs: - uses: krdlab/setup-haxe@master with: - haxe-version: 4.2.5 + haxe-version: 4.3.3 # Runs a set of commands using the runners shell - name: Install Haxelib run: | diff --git a/source/psychlua/HScript.hx b/source/psychlua/HScript.hx index 6438e7d7102..410bc885399 100644 --- a/source/psychlua/HScript.hx +++ b/source/psychlua/HScript.hx @@ -314,7 +314,7 @@ class HScript extends SScript } } - public function executeCode(?funcToRun:String = null, ?funcArgs:Array = null):TeaCall { + public function executeCode(?funcToRun:String = null, ?funcArgs:Array = null):Tea { if (funcToRun == null) return null; if(!exists(funcToRun)) { @@ -346,7 +346,7 @@ class HScript extends SScript return callValue; } - public function executeFunction(funcToRun:String = null, funcArgs:Array):TeaCall { + public function executeFunction(funcToRun:String = null, funcArgs:Array):Tea { if (funcToRun == null) return null; return call(funcToRun, funcArgs); } @@ -356,7 +356,7 @@ class HScript extends SScript funk.addLocalCallback("runHaxeCode", function(codeToRun:String, ?varsToBring:Any = null, ?funcToRun:String = null, ?funcArgs:Array = null):Dynamic { #if SScript initHaxeModuleCode(funk, codeToRun, varsToBring); - final retVal:TeaCall = funk.hscript.executeCode(funcToRun, funcArgs); + final retVal:Tea = funk.hscript.executeCode(funcToRun, funcArgs); if (retVal != null) { if(retVal.succeeded) return (retVal.returnValue == null || LuaUtils.isOfTypes(retVal.returnValue, [Bool, Int, Float, String, Array])) ? retVal.returnValue : null;