Merge branch 'Lost-Paradise-Project:master' into master

Lost-Paradise-Project · Sep 4, 2024 · f72196e · f72196e
2 parents 1547012 + f96546e
commit f72196e
Show file tree

Hide file tree

Showing 572 changed files with 118,927 additions and 10,644 deletions.
diff --git a/.github/workflows/build-map-renderer.yml b/.github/workflows/build-map-renderer.yml
@@ -1,7 +1,12 @@
 name: Build & Test Map Renderer
 
 on:
-  workflow_dispatch:
+  push:
+    branches: [ master, staging, trying ]
+  merge_group:
+  pull_request:
+    types: [ opened, reopened, synchronize, ready_for_review ]
+    branches: [ master ]
 
 jobs:
   build:

diff --git a/.github/workflows/build-test-debug.yml b/.github/workflows/build-test-debug.yml
@@ -1,7 +1,12 @@
 name: Build & Test Debug
 
 on:
-  workflow_dispatch:
+  push:
+    branches: [ master, staging, trying ]
+  merge_group:
+  pull_request:
+    types: [ opened, reopened, synchronize, ready_for_review ]
+    branches: [ master ]
 
 jobs:
   build:

diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -5,9 +5,10 @@ on:
     types: [closed]
 
 env:
-  GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
+  BOT_TOKEN: ${{ secrets.BOT_TOKEN }}
   CHANGELOG_DIR: Resources/Changelog/ChangelogLPP.yml
   PR_NUMBER: ${{ github.event.number }}
+  CHANGELOG_DISCORD_WEBHOOK: ${{ secrets.CHANGELOG_DISCORD_WEBHOOK }}
 
 jobs:
   changelog:

diff --git a/.github/workflows/close-master-pr.yml b/.github/workflows/close-master-pr.yml
@@ -1,8 +1,7 @@
 name: Close PRs on master
 
 on:
-  pull_request_target:
-    types: [ opened, ready_for_review ]
+  workflow_dispatch:
 
 jobs:
   run:
@@ -12,8 +11,8 @@ jobs:
     steps:
     - uses: superbrothers/close-pull-request@v3
       with:
-        token: ${{ secrets.BOT_TOKEN }}
-        comment: "Благодарим вас за вклад в наш репозиторий. К сожалению, похоже, что вы отправили ПР из master ветки. Мы рекомендуем вам следовать [документации](https://docs.spacestation14.com/en/general-development/setup/git-for-the-ss14-developer.html). \n\n Вы можете перенести свою текущую работу из основной ветки в другую ветку с помощью [создав новый](https://git-scm.com/docs/git-branch) и [очистив](https://git-scm.com/docs/git-reset) master ветку."
+        github_token: ${{ secrets.BOT_TOKEN }}
+        comment: "Благодарим вас за вклад в наш репозиторий. К сожалению, похоже, что вы отправили ПР из master ветки. Мы рекомендуем вам следовать [документации](https://docs.spacestation14.com/en/general-development/setup/git-for-the-ss14-developer.html). \n\n Вы можете перенести свою текущую работу из основной ветки в другую ветку с помощью [создания новой](https://git-scm.com/docs/git-branch) и [очистки](https://git-scm.com/docs/git-reset) master ветки."
 
     # If you prefer to just comment on the pr and not close it, uncomment the bellow and comment the above
 

diff --git a/.github/workflows/conflict-labeler.yml b/.github/workflows/conflict-labeler.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   Label:
-    if: github.actor != 'PJBot' && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14' != 'Lost-Paradise-Bot'
+    if: github.actor != 'PJBot' && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14' && github.actor != 'Lost-Paradise-Bot'
     runs-on: ubuntu-latest
     steps:
       - name: Check for Merge Conflicts

diff --git a/.github/workflows/publish-lostparadise.yml b/.github/workflows/publish-lostparadise.yml
@@ -18,15 +18,14 @@ jobs:
     - name: Download parts
       run: |
         git clone ${{ secrets.HUB_SEC_TOKEN }}
-        mv Secrets/_PrivateResources/* Resources/
+        mv Secrets/_PrivateResources/_Private Resources/Prototypes/
+        mv Secrets/_PrivateResources/PERSONAL Resources/Textures/
         mv Secrets/_PrivateShared Content.Shared/_PrivateShared
         mv Secrets/_PrivateServer Content.Server/_PrivateServer
         mv Secrets/_PrivateClient Content.Client/_PrivateClient
 
     - name: Setup .NET Core
       uses: actions/[email protected]
-      with:
-        dotnet-version: 8.0.x
 
     - name: Get Engine Tag
       run: |
@@ -40,29 +39,29 @@ jobs:
       run: dotnet build Content.Packaging --configuration Release --no-restore /m
 
     - name: Package server
-      run: dotnet run --project Content.Packaging server --platform linux-x64 --hybrid-acz
+      run: dotnet run --project Content.Packaging server --platform linux-x64
 
-    - name: Shuffle files around
-      run: |
-        mkdir "release/${{ github.sha }}"
-        mv release/*.zip "release/${{ github.sha }}"
+    - name: Package client
+      run: dotnet run --project Content.Packaging client --no-wipe-release
 
-    - name: Upload files to centcomm
-      uses: appleboy/scp-action@master
+    - name: Upload build artifact
+      id: artifact-upload-step
+      uses: actions/upload-artifact@v4
       with:
-        host: ${{ secrets.HOST }}
-        username: ${{ secrets.USERNAME }}
-        key: ${{ secrets.SSH }}
-        port: ${{ secrets.PORT }}
-        source: "release/${{ github.sha }}"
-        target: "/var/www/wiki/builds_dir/builds/"
-        strip_components: 1
+        name: build
+        path: release/*.zip
+        compression-level: 0
+        retention-days: 0
+
+    - name: Publish version
+      run: Tools/publish_github_artifact.py
+      env:
+        BOT_TOKEN: ${{ secrets.BOT_TOKEN }}
+        PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
+        ARTIFACT_ID: ${{ steps.artifact-upload-step.outputs.artifact-id }}
+        GITHUB_REPOSITORY: ${{ vars.GITHUB_REPOSITORY }}
 
-    - name: Update manifest JSON
-      uses: appleboy/ssh-action@master
+    - uses: geekyeggo/delete-artifact@v5
+      if: always()
       with:
-        host: ${{ secrets.HOST }}
-        username: ${{ secrets.USERNAME }}
-        key: ${{ secrets.SSH }}
-        port: ${{ secrets.PORT }}
-        script: pwsh /var/www/wiki/push.ps1 ${{ github.sha }}
+        name: build
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -39,33 +39,22 @@ jobs:
     - name: Package client
       run: dotnet run --project Content.Packaging client --no-wipe-release
 
-    - name: Update Build Info
-      run: Tools/gen_build_info.py
-
-    - name: Shuffle files around
-      run: |
-        mkdir "release/${{ github.sha }}"
-        mv release/*.zip "release/${{ github.sha }}"
-
-    - name: Upload files to centcomm
-      uses: appleboy/scp-action@master
+    - name: Upload build artifact
+      id: artifact-upload-step
+      uses: actions/upload-artifact@v4
       with:
-        host: ${{ secrets.PUBLISH_HOST }}
-        username: ${{ secrets.PUBLISH_USER }}
-        key: ${{ secrets.PUBLISH_KEY }}
-        port: ${{ secrets.PUBLISH_PORT }}
-        source: "release/${{ github.sha }}"
-        target: "/var/www/builds.delta-v.org/delta-v/builds/"
-        strip_components: 1
+        name: build
+        path: release/*.zip
+        compression-level: 0
+        retention-days: 0
 
-    - name: Update manifest JSON
-      uses: appleboy/ssh-action@master
-      with:
-        host: ${{ secrets.PUBLISH_HOST }}
-        username: ${{ secrets.PUBLISH_USER }}
-        key: ${{ secrets.PUBLISH_KEY }}
-        port: ${{ secrets.PUBLISH_PORT }}
-        script: /home/deltav/publish/push.ps1 ${{ github.sha }}
+    - name: Publish version
+      run: Tools/publish_github_artifact.py
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
+        ARTIFACT_ID: ${{ steps.artifact-upload-step.outputs.artifact-id }}
+        GITHUB_REPOSITORY: ${{ vars.GITHUB_REPOSITORY }}
 
     - name: Publish changelog (Discord)
       run: Tools/actions_changelogs_since_last_run.py
@@ -77,3 +66,8 @@ jobs:
       run: Tools/actions_changelog_rss.py
       env:
         CHANGELOG_RSS_KEY: ${{ secrets.CHANGELOG_RSS_KEY }}
+
+    - uses: geekyeggo/delete-artifact@v5
+      if: always()
+      with:
+        name: build
diff --git a/.github/workflows/rsi-diff.yml b/.github/workflows/rsi-diff.yml
@@ -1,7 +1,9 @@
 name: Diff RSIs
 
 on:
-  workflow_dispatch:
+  pull_request_target:
+    paths:
+    - '**.rsi/**.png'
 
 jobs:
   diff:
@@ -42,6 +44,7 @@ jobs:
         uses: peter-evans/create-or-update-comment@v1
         with:
           issue-number: ${{ github.event.number }}
+          token: ${{ secrets.BOT_TOKEN }}
           body: |
             ${{ steps.diff.outputs.summary-details }}
 
@@ -50,6 +53,7 @@ jobs:
         uses: peter-evans/create-or-update-comment@v1
         with:
           comment-id: ${{ steps.fc.outputs.comment-id }}
+          token: ${{ secrets.BOT_TOKEN }}
           edit-mode: replace
           body: |
             ${{ steps.diff.outputs.summary-details }}
@@ -59,6 +63,7 @@ jobs:
         uses: peter-evans/create-or-update-comment@v1
         with:
           comment-id: ${{ steps.fc.outputs.comment-id }}
+          token: ${{ secrets.BOT_TOKEN }}
           edit-mode: append
           body: |
             Edit: diff updated after ${{ github.event.pull_request.head.sha }}
diff --git a/.github/workflows/test-packaging.yml b/.github/workflows/test-packaging.yml
@@ -1,51 +1,66 @@
 name: Test Packaging
 
 on:
-  workflow_dispatch:
+  push:
+    branches: [ master, staging, trying ]
+    paths:
+    - '**.cs'
+    - '**.csproj'
+    - '**.sln'
+    - '**.git**'
+    - '**.yml'
+    # no docs on which one of these is supposed to work, so
+    # why not just do both
+    - 'RobustToolbox'
+    - 'RobustToolbox/**'
+  merge_group:
+  pull_request:
+    types: [ opened, reopened, synchronize, ready_for_review ]
+    branches: [ master ]
+    paths:
+    - '**.cs'
+    - '**.csproj'
+    - '**.sln'
+    - '**.git**'
+    - '**.yml'
+    - 'RobustToolbox'
+    - 'RobustToolbox/**'
 
 jobs:
   build:
     name: Test Packaging
-    if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14'
+    if: github.actor != 'PJBot' && github.actor != 'PJBot' && github.event.pull_request.draft == false
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout Master
-        uses: actions/[email protected]
+    - name: Checkout Master
+      uses: actions/[email protected]
 
-      - name: Setup Submodule
-        run: |
-          git submodule update --init --recursive
+    - name: Setup Submodule
+      run: |
+        git submodule update --init --recursive
 
-      - name: Pull engine updates
-        uses: space-wizards/[email protected]
+    - name: Pull engine updates
+      uses: space-wizards/[email protected]
 
-      - name: Update Engine Submodules
-        run: |
-          cd RobustToolbox/
-          git submodule update --init --recursive
+    - name: Update Engine Submodules
+      run: |
+        cd RobustToolbox/
+        git submodule update --init --recursive
 
-      - name: Setup .NET Core
-        uses: actions/[email protected]
-        with:
-          dotnet-version: 8.0.100
+    - name: Setup .NET Core
+      uses: actions/[email protected]
+      with:
+        dotnet-version: 8.0.100
 
-      - name: Install dependencies
-        run: dotnet restore
+    - name: Install dependencies
+      run: dotnet restore
 
-      - name: Build Packaging
-        run: dotnet build Content.Packaging --configuration Release --no-restore /m
+    - name: Build Packaging
+      run: dotnet build Content.Packaging --configuration Release --no-restore /m
 
-      - name: Package server
-        run: dotnet run --project Content.Packaging server --platform win-x64 --platform linux-x64 --platform osx-x64 --platform linux-arm64
+    - name: Package server
+      run: dotnet run --project Content.Packaging server --platform win-x64 --platform linux-x64 --platform osx-x64 --platform linux-arm64
 
-      - name: Package client
-        run: dotnet run --project Content.Packaging client --no-wipe-release
-
-      - name: Update Build Info
-        run: Tools/gen_build_info.py
-
-      - name: Shuffle files around
-        run: |
-          mkdir "release/${{ github.sha }}"
-          mv release/*.zip "release/${{ github.sha }}"
+    - name: Package client
+      run: dotnet run --project Content.Packaging client --no-wipe-release
diff --git a/.github/workflows/validate-rgas.yml b/.github/workflows/validate-rgas.yml
@@ -1,6 +1,10 @@
 name: RGA schema validator
 on:
-  workflow_dispatch:
+  push:
+    branches: [ master, staging, trying ]
+  merge_group:
+  pull_request:
+    types: [ opened, reopened, synchronize, ready_for_review ]
 
 jobs:
   yaml-schema-validation:

diff --git a/.github/workflows/validate-rsis.yml b/.github/workflows/validate-rsis.yml
@@ -1,7 +1,12 @@
 name: RSI Validator
 
 on:
-  workflow_dispatch:
+  push:
+    branches: [ staging, trying ]
+  merge_group:
+  pull_request:
+    paths:
+    - '**.rsi/**'
 
 jobs:
   validate_rsis:

diff --git a/.github/workflows/validate_mapfiles.yml b/.github/workflows/validate_mapfiles.yml
@@ -1,6 +1,10 @@
 name: Map file schema validator
 on:
-  workflow_dispatch:
+  push:
+    branches: [ master, staging, trying ]
+  merge_group:
+  pull_request:
+    types: [ opened, reopened, synchronize, ready_for_review ]
 
 jobs:
   yaml-schema-validation:

diff --git a/.github/workflows/yaml-linter.yml b/.github/workflows/yaml-linter.yml
@@ -1,7 +1,11 @@
 name: YAML Linter
 
 on:
-  workflow_dispatch:
+  push:
+    branches: [ master, staging, trying ]
+  merge_group:
+  pull_request:
+    types: [ opened, reopened, synchronize, ready_for_review ]
 
 jobs:
   build: