Merge pull request #353 from Panakotta00/development

Development
Panakotta00 · Nov 6, 2024 · 591001b · 591001b
2 parents 9c79840 + 777c506
commit 591001b
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/.github/workflows/deploy-to-smr.yml b/.github/workflows/deploy-to-smr.yml
@@ -6,10 +6,15 @@ on:
       should_upload:
         type: boolean
         default: true
+      dev_run:
+        type: boolean
+        default: false
   workflow_call:
     secrets:
       SMR_API_KEY:
         required: true
+      SMR_API_KEY_DEV:
+        required: false
       RELEASE_WEBHOOK_URL:
         required: true
 
@@ -34,11 +39,11 @@ jobs:
               per_page: 1,
             });
             const release = response.data[0];
-            if (release.draft) {
+            if (!${{inputs.dev_run == true}} && release.draft) {
               core.setFailed('Found Release is a draft!');
               return;
             }
-            core.setOutput('body', btoa(release.body.replaceAll("*", "\\*")));
+            core.setOutput('body', release.body.replaceAll("*", "*"));
             core.setOutput('name', release.name);
       
       - name: Download FicsIt-Networks Version
@@ -58,7 +63,8 @@ jobs:
         if: ${{inputs.should_upload}}
         env:
           BODY: ${{steps.find-release.outputs.body}}
-        run: ficsit --api-key "${{secrets.SMR_API_KEY}}" smr upload 8d8gk4imvFanRs FicsItNetworks.zip $BODY
+        run: |
+          ficsit ${{ inputs.dev_run && '--api-base https://api.ficsit.dev' || '' }} --api-key "${{ inputs.dev_run && secrets.SMR_API_KEY_DEV || secrets.SMR_API_KEY }}" smr upload ${{ inputs.dev_run && '27CoRS8wTsW1wD' || '8d8gk4imvFanRs'}} FicsItNetworks.zip "$BODY"
 
       - name: Wait for Approval
         uses: actions/github-script@v7
@@ -68,7 +74,7 @@ jobs:
               await new Promise(resolve => setTimeout(resolve, 5000));
               let response = await fetch("https://api.ficsit.app/v2/query", {
                 method: "POST",
-                headers: {"Cookies": "token=${{secrets.SMR_API_KEY}}", "Content-Type":"application/json"},
+                headers: {"Cookies": "token=${{ inputs.dev_run && secrets.SMR_API_KEY_DEV || secrets.SMR_API_KEY }}", "Content-Type":"application/json"},
                 body: JSON.stringify({
                   query: '{getModByReference(modReference:"FicsItNetworks"){versions(filter:{order_by:created_at}){version approved virustotal_results{safe}}}}'
                 })
@@ -92,6 +98,7 @@ jobs:
             }
   send-discord-release-message:
     needs: deploy-to-smr
+    if: ${{!inputs.dev_run}}
     uses: ./.github/workflows/send-discord-release.yml
     secrets:
       RELEASE_WEBHOOK_URL: ${{ secrets.RELEASE_WEBHOOK_URL }}
diff --git a/FicsItNetworks.uplugin b/FicsItNetworks.uplugin
@@ -2,7 +2,7 @@
 	"FileVersion": 3,
 	"Version": 0,
 	"VersionName": "0.3",
-	"SemVersion": "0.3.25",
+	"SemVersion": "0.3.26",
 	"FriendlyName": "FicsIt-Networks",
 	"Description": "Adds a computer network and programmable computers to the Game.",
 	"Category": "Modding",

diff --git a/Source/FicsItNetworksLua/Private/FINLua/LuaGlobalLib.cpp b/Source/FicsItNetworksLua/Private/FINLua/LuaGlobalLib.cpp
@@ -46,7 +46,7 @@ namespace FINLua {
 
 	int luaYield(lua_State* L) {
 		const int args = lua_gettop(L);
-		return luaFIN_yield(L, args+1, NULL, &luaYieldResume);
+		return luaFIN_yield(L, args, NULL, &luaYieldResume);
 	}
 
 	int luaResume(lua_State* L); // pre-declare
@@ -57,13 +57,13 @@ namespace FINLua {
 
 	int luaResume(lua_State* L) {
 		const int args = lua_gettop(L);
-		if (!lua_isthread(L, 1)) return luaL_argerror(L, 1, "is no thread");
+		luaL_checktype(L, 1, LUA_TTHREAD);
 		lua_State* thread = lua_tothread(L, 1);
 
 		if (!lua_checkstack(thread, args - 1)) {
 			lua_pushboolean(L, false);
 			lua_pushliteral(L, "too many arguments to resume");
-			return 1;
+			return 2;
 		}
 
 		// attach hook for out-of-time exception if thread got loaded from save and hook is not applied
@@ -76,12 +76,13 @@ namespace FINLua {
 		const int status = lua_resume(thread, L, args - 1, &argCount);
 
 		if (status == LUA_OK || status == LUA_YIELD) {
+			luaFINDebug_dumpStack(thread);
 			if (argCount == 0 && status == LUA_YIELD) {
 				// A hook yielded the thread
 				return lua_yieldk(L, 0, NULL, &luaResumeResume);
 			}
 
-			if (status == LUA_YIELD) argCount = argCount-1; 
+			if (status == LUA_YIELD) argCount = argCount-1;
 
 			if (!lua_checkstack(L, argCount)) {
 				lua_pop(thread, argCount);

diff --git a/Source/FicsItNetworksLua/Private/FINLua/LuaUtil.cpp b/Source/FicsItNetworksLua/Private/FINLua/LuaUtil.cpp
@@ -401,6 +401,7 @@ namespace FINLua {
 	}
 
 	void luaFINDebug_dumpStack(lua_State* L) {
+		UE_LOG(LogFicsItNetworksLua, Warning, TEXT("Dumping stack of thread %p:"), L);
 		int args = lua_gettop(L);
 		int negative = 0;
 		for (; args > 0; --args) {