#38 Add synchronisation for client and server mods

.github/dependabot.yml

@@ -15,7 +15,7 @@ updates:
       day: "thursday"
       time: "18:00"
       timezone: "Europe/Berlin"
-    target-branch: "develop"
+    target-branch: "dependencies"
 
   - package-ecosystem: "gitsubmodule"
     directory: "."
@@ -24,4 +24,4 @@ updates:
       day: "thursday"
       time: "18:00"
       timezone: "Europe/Berlin"
-    target-branch: "develop"
+    target-branch: "dependencies"

.github/workflows/update-git-submodules.yml

@@ -0,0 +1,53 @@
+name: Git submodule updater
+
+on:
+  push:
+
+  schedule:
+    - cron: '0 6 * * 0'
+  workflow_dispatch:
+
+jobs:
+  update-submodules:
+    name: Update submodules
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+          persist-credentials: false
+
+#      - name: Import GPG key
+#        id: import-gpg
+#        uses: crazy-max/[email protected]
+#        with:
+#          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+#          passphrase: ${{ secrets.GPG_PASS }}
+#          git_config_global: true
+#          git_user_signingkey: true
+#          git_commit_gpgsign: true
+
+      - name: Update submodules
+        run: |
+          git submodule foreach 'git fetch -t --unshallow
+            git checkout "$(git describe --tags --abbrev=0 origin/HEAD)"'
+
+      - name: Try to commit
+        run: |
+          if git commit -am"$(
+              echo 'Update submodules (automated)'
+              echo
+              git submodule status | grep '^+' | cut '-d ' -f2-
+              )"; then
+            ./configure
+            make
+            git push
+          fi
+#        env:
+#          GITHUB_TOKEN: ${{ secrets.GH_PASS }}
+#          GIT_AUTHOR_NAME: ${{ steps.import-gpg.outputs.name }}
+#          GIT_AUTHOR_EMAIL: ${{ steps.import-gpg.outputs.email }}
+#          GIT_COMMITTER_NAME: ${{ steps.import-gpg.outputs.name }}
+#          GIT_COMMITTER_EMAIL: ${{ steps.import-gpg.outputs.email }}

.github/workflows/version-and-changelog-update.yml

@@ -1,6 +1,5 @@
 name: Version and changelog update
 on:
-
   pull_request_target:
     types: [ opened, edited, synchronize, closed ]
 jobs:

.github/workflows/windows-latest-lua-unit-testing.yml

@@ -119,7 +119,7 @@ jobs:
         run: |
           #echo "C:\msys64\mingw32\bin" >> $GITHUB_PATH
           #cp C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin\x86_64-w64-mingw32-gcc.exe C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin\mingw32-gcc.exe
-          
+
           Start-Process -FilePath "${{ env.temp_dir }}\luarocks-3.8.0-windows-32\luarocks.exe" -ArgumentList "--lua-dir=${{ env.lua_install_dir }} --lua-version=5.1 --tree=${{ env.lua_install_dir }} install luacov" -Wait -NoNewWindow
           Start-Process -FilePath "${{ env.temp_dir }}\luarocks-3.8.0-windows-32\luarocks.exe" -ArgumentList "--lua-dir=${{ env.lua_install_dir }} --lua-version=5.1 --tree=${{ env.lua_install_dir }} install lua-path" -Wait -NoNewWindow
           Start-Process -FilePath "${{ env.temp_dir }}\luarocks-3.8.0-windows-32\luarocks.exe" -ArgumentList "--lua-dir=${{ env.lua_install_dir }} --lua-version=5.1 --tree=${{ env.lua_install_dir }} install dkjson" -Wait -NoNewWindow
@@ -134,13 +134,13 @@ jobs:
 
           Start-Process -FilePath "${{ env.lua_install_bin_dir }}\luacov.bat" -Wait -NoNewWindow
 
-      - name: Generate coverage report with luacov-coveralls
-        shell: cmd
-        env:
-          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          COVERALLS_DEBUG: true
-        run: |
-          #${{ env.lua_install_bin_dir }}\luacov-coveralls.bat -v
+      # - name: Generate coverage report with luacov-coveralls
+      #   shell: cmd
+      #   env:
+      #     COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      #     COVERALLS_DEBUG: true
+      #   run: |
+      #     ${{ env.lua_install_bin_dir }}\luacov-coveralls.bat -v
 
       - name: Fix codecov path issue
         shell: pwsh

.testing/tests/mods/noita-mp/config_test.lua

@@ -5,9 +5,11 @@ local lu = require("luaunit")
 TestConfig = {}
 
 function TestConfig:setUp()
-    print("\nsetUp")
+    print("\n setUp")
 end
 
 function TestConfig:tearDown()
     print("tearDown\n")
-end
+end
+
+os.exit(lu.LuaUnit.run())

.testing/tests/mods/noita-mp/files/scripts/extensions/string_extensions_test.lua

@@ -10,4 +10,26 @@ end
 
 function TestStringExtensions:tearDown()
     print("tearDown\n")
-end
+end
+
+function TestStringExtensions:testExtendAndCutStringToLength()
+    lu.assertErrorMsgEquals("var is not a string.", string.ExtendOrCutStringToLength, 1)
+    lu.assertErrorMsgEquals("length is not a number.", string.ExtendOrCutStringToLength, "var", "length")
+    lu.assertErrorMsgContains(
+        "char is not a character. string.len(char) > 1 = ",
+        string.ExtendOrCutStringToLength,
+        "var",
+        1,
+        "character"
+    )
+
+    local expected = "12345"
+    local actual = string.ExtendOrCutStringToLength("12345678910", 5, " ")
+    lu.assertEquals(actual, expected)
+
+    local expected2 = "1234      "
+    local actual2 = string.ExtendOrCutStringToLength("1234", 10, " ")
+    lu.assertEquals(actual2, expected2)
+end
+
+os.exit(lu.LuaUnit.run())

.testing/tests/mods/noita-mp/files/scripts/init/init__test.lua

@@ -10,4 +10,6 @@ end
 
 function TestInit_:tearDown()
     print("tearDown\n")
-end
+end
+
+os.exit(lu.LuaUnit.run())

.testing/tests/mods/noita-mp/files/scripts/init/init_logger_test.lua

@@ -10,4 +10,6 @@ end
 
 function TestInitLogger:tearDown()
     print("tearDown\n")
-end
+end
+
+os.exit(lu.LuaUnit.run())

.testing/tests/mods/noita-mp/files/scripts/init/init_package_loading_test.lua

@@ -10,4 +10,6 @@ end
 
 function TestInitPackageLoading:tearDown()
     print("tearDown\n")
-end
+end
+
+os.exit(lu.LuaUnit.run())

.testing/tests/mods/noita-mp/files/scripts/util/EntityUtils_test.lua

@@ -10,4 +10,6 @@ end
 
 function TestEntityUtils:tearDown()
     print("tearDown\n")
-end
+end
+
+os.exit(lu.LuaUnit.run())

.testing/tests/mods/noita-mp/files/scripts/util/GlobalsUtils_test.lua

@@ -10,4 +10,6 @@ end
 
 function TestGlobalsUtils:tearDown()
     print("tearDown\n")
-end
+end
+
+os.exit(lu.LuaUnit.run())

.testing/tests/mods/noita-mp/files/scripts/util/NetworkVscUtils_test.lua

@@ -10,4 +10,6 @@ end
 
 function TestNetworkVscUtils:tearDown()
     print("tearDown\n")
-end
+end
+
+os.exit(lu.LuaUnit.run())

.testing/tests/mods/noita-mp/files/scripts/util/NuidUtils_test.lua

@@ -10,4 +10,6 @@ end
 
 function TestNuidUtils:tearDown()
     print("tearDown\n")
-end
+end
+
+os.exit(lu.LuaUnit.run())

.testing/tests/mods/noita-mp/files/scripts/util/guid_test.lua

@@ -8,6 +8,17 @@ TestGuid = {}
 
 function TestGuid:setUp()
     print("\nsetUp")
+    -- Mock Noita Api global functions
+    _G.DebugGetIsDevBuild = function()
+        return false
+    end
+
+    --- Mocked in guid_test.lua
+    --- @param id string
+    --- @return nil nil Returns nil in this case.
+    _G.ModSettingGet = function(id)
+        return nil
+    end
 end
 
 function TestGuid:tearDown()

.testing/tests/mods/noita-mp/files/scripts/util/util_test.lua

@@ -8,6 +8,13 @@ TestUtil = {}
 
 function TestUtil:setUp()
     print("\nsetUp")
+
+    --- Mocked in guid_test.lua
+    --- @param id string
+    --- @return nil nil Returns nil in this case.
+    _G.ModSettingGet = function(id)
+        return nil
+    end
 end
 
 function TestUtil:tearDown()
@@ -36,24 +43,4 @@ function TestUtil:testIsEmpty()
     lu.assertIsTrue(util.IsEmpty({}))
 end
 
-function TestUtil:testExtendAndCutStringToLength()
-    lu.assertErrorMsgEquals("var is not a string.", util.ExtendAndCutStringToLength, 1)
-    lu.assertErrorMsgEquals("length is not a number.", util.ExtendAndCutStringToLength, "var", "length")
-    lu.assertErrorMsgContains(
-        "char is not a character. string.len(char) > 1 = ",
-        util.ExtendAndCutStringToLength,
-        "var",
-        1,
-        "character"
-    )
-
-    local expected = "12345"
-    local actual = util.ExtendAndCutStringToLength("12345678910", 5, " ")
-    lu.assertEquals(actual, expected)
-
-    local expected2 = "1234      "
-    local actual2 = util.ExtendAndCutStringToLength("1234", 10, " ")
-    lu.assertEquals(actual2, expected2)
-end
-
 os.exit(lu.LuaUnit.run())

.testing/tests/mods/noita-mp/init_test.lua

@@ -10,4 +10,6 @@ end
 
 function TestInit:tearDown()
     print("tearDown\n")
-end
+end
+
+os.exit(lu.LuaUnit.run())