Merge branch 'refs/heads/master' into development

# Conflicts: # .github/workflows/build.yml
Panakotta00 · Jun 29, 2024 · 23f7d41 · 23f7d41
2 parents c04084d + 0eaa319
commit 23f7d41
Showing 1 changed file with 21 additions and 24 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - master
-      - dev
+      - development
     paths:
       - "FicsItNetworks.uplugin"
       - "Content/**"
@@ -30,28 +30,28 @@ on:
 
 jobs:
   build:
-    runs-on: windows-latest
+    runs-on: Windows2019-selfhosted
     steps:
       - name: Cleanup
-        run: Remove-Item C:\workspace\SatisfactoryModLoader -Recurse -Force -Confirm:$false -ErrorAction Ignore
+        run: Remove-Item C:\actions-runner\_work\FicsIt-Networks\FicsIt-Networks\* -Recurse -Force -Confirm:$false -ErrorAction Ignore
 
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v4
         with:
           repository: satisfactorymodding/SatisfactoryModLoader
           ref: refs/heads/dev
           path: SatisfactoryModLoader
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           path: SatisfactoryModLoader/Mods/FicsItNetworks
           submodules: recursive
 
-      - name: List Stuff
-        run: |
-          dir SatisfactoryModLoader/Mods/FicsItNetworks
-          dir SatisfactoryModLoader/Mods/FicsItNetworks/ThirdParty
-          dir SatisfactoryModLoader/Mods/FicsItNetworks/ThirdParty/eris
-          dir SatisfactoryModLoader/Mods/FicsItNetworks/ThirdParty/eris/src
+#      - name: List Stuff
+#        run: |
+#          dir SatisfactoryModLoader/Mods/FicsItNetworks
+#          dir SatisfactoryModLoader/Mods/FicsItNetworks/ThirdParty
+#          dir SatisfactoryModLoader/Mods/FicsItNetworks/ThirdParty/eris
+#          dir SatisfactoryModLoader/Mods/FicsItNetworks/ThirdParty/eris/src
 
       - name: Apply FG Patches
         working-directory: SatisfactoryModLoader
@@ -67,9 +67,8 @@ jobs:
           7z x UnrealEngine-CSS-Editor-Win64.7z.001
           rm UnrealEngine-CSS-Editor-Win64.7z*
           .\\SetupScripts\\Register.bat
-          .\\Engine\\Extras\\Redist\\en-us\\UEPrereqSetup_x64.exe
         env:
-          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+          GH_TOKEN: ${{ secrets.GH_TOKEN }}
 
       - name: Add Wwise
         run: |
@@ -82,7 +81,7 @@ jobs:
           WWISE_PASSWORD: ${{ secrets.WWISE_PASSWORD }}
 
       - name: Add msbuild to PATH
-        uses: microsoft/setup-msbuild@v1
+        uses: microsoft/setup-msbuild@v2
 
       - name: Generate VS project files
         run: ${{ github.workspace }}\ue\Engine\Build\BatchFiles\Build.bat -projectfiles -project='${{ github.workspace }}\SatisfactoryModLoader\FactoryGame.uproject' -game -rocket -progres
@@ -102,17 +101,15 @@ jobs:
       - name: Package FicsItNetworks Mod
         run: ${{ github.workspace }}\ue\Engine\Build\BatchFiles\RunUAT.bat -ScriptsForProject='${{ github.workspace }}\SatisfactoryModLoader\FactoryGame.uproject' PackagePlugin -project='${{ github.workspace }}\SatisfactoryModLoader\FactoryGame.uproject' -clientconfig=Shipping -serverconfig=Shipping -DLCName='FicsItNetworks' -build -utf8output -platform=Win64 -nocompileeditor -installed -abslog="C:\Users\runneradmin\AppData\Roaming\Unreal Engine\AutomationTool\Logs\D+a+FicsIt-Networks+FicsIt-Networks+ue\Log.txt"
 
-      - name: Show Package Log
-        if: always()
-        run: |
-          more "C:\Users\runneradmin\AppData\Roaming\Unreal Engine\AutomationTool\Logs\D+a+FicsIt-Networks+FicsIt-Networks+ue\Cook-*"
-          more "C:\Users\runneradmin\AppData\Roaming\Unreal Engine\AutomationTool\Logs\D+a+FicsIt-Networks+FicsIt-Networks+ue\Log.txt"
+#      - name: Show Package Log
+#        if: always()
+#        run: more "C:\Users\runneradmin\AppData\Roaming\Unreal Engine\AutomationTool\Logs\D+a+FicsIt-Networks+FicsIt-Networks+ue\Cook-*"
 
-      - name: List Artifacts
-        run: |
-          dir ${{ github.workspace }}\SatisfactoryModLoader\Saved\ArchivedPlugins\FicsItNetworks\
+#      - name: List Artifacts
+#        run: |
+#          dir ${{ github.workspace }}\SatisfactoryModLoader\Saved\ArchivedPlugins\FicsItNetworks\
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: FicsItNetworks-Windows
-          path: ${{ github.workspace }}\SatisfactoryModLoader\Saved\ArchivedPlugins\FicsItNetworks\FicsItNetworks-Windows.zip
+          path: ${{github.workspace}}\SatisfactoryModLoader\Saved\ArchivedPlugins\FicsItNetworks\FicsItNetworks-Windows.zip