Merge branch 'master' into 738

.editorconfig

@@ -129,7 +129,7 @@ csharp_indent_braces = false
 csharp_indent_switch_labels = true
 
 # Space preferences
-csharp_space_after_cast = true
+csharp_space_after_cast = false
 csharp_space_after_colon_in_inheritance_clause = true
 csharp_space_after_comma = true
 csharp_space_after_dot = false

.github/labeler.yml

@@ -5,9 +5,9 @@
 "Changes: Map":
 - changed-files:
   - any-glob-to-any-file:
-    - 'Resources/Maps/*.yml'
-    - 'Resources/Prototypes/Maps/*.yml'
-    - 'Resources/Prototypes/Corvax/Maps/*.yml'
+    - 'Resources/Maps/**/*.yml'
+    - 'Resources/Prototypes/Maps/**/*.yml'
+    - 'Resources/Prototypes/Corvax/Maps/**/*.yml'
 
 "Changes: UI":
 - changed-files:

.github/workflows/auto-cl-update-atd.yml

@@ -34,7 +34,7 @@ jobs:
     - name: Run post-merge script
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: python Tools/ATD/auto_cl.py "${{ env.GITHUB_TOKEN }}" "${{ github.repository }}"
+      run: python Tools/ADT/auto_cl.py "${{ env.GITHUB_TOKEN }}" "${{ github.repository }}"
 
     - name: Configure Git
       run: |

.github/workflows/labeler-pr.yml

@@ -1,4 +1,4 @@
-name: "Labels: PR"
+name: "Labels: PR"
 
 on:
 - pull_request_target
@@ -12,5 +12,5 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/labeler@v5
-      with:
-        sync-labels: true
+      with:                # ADT Tweak by Schrodinger
+        sync-labels: true  # Поправил auto-labels

.github/workflows/publish-adt.yml

@@ -0,0 +1,114 @@
+name: Publish ADT
+
+#concurrency:
+#  group: publish
+
+on:
+  workflow_dispatch:
+  schedule:
+  - cron: '0 6 * * *'
+  workflow_run:
+    workflows: [Build & Test Release]
+    types: [completed]
+
+jobs:
+  build:
+    if: ${{ github.event.workflow_run.conclusion == 'success' || github.event_name == 'workflow_dispatch' }}
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Install dependencies
+      run: sudo apt-get install -y python3-paramiko python3-lxml
+
+    - uses: actions/[email protected]
+      with:
+        submodules: 'recursive'
+    - name: Setup .NET Core
+      uses: actions/[email protected]
+      with:
+        dotnet-version: 8.0.x
+
+    - name: Get Engine Tag
+      run: |
+        cd RobustToolbox
+        git fetch --depth=1
+
+    - name: Install dependencies
+      run: dotnet restore
+
+    - name: Build Packaging
+      run: dotnet build Content.Packaging --configuration Release --no-restore /m
+
+    - name: Package server
+      run: dotnet run --project Content.Packaging server --platform linux-x64
+
+    - name: Package client
+      run: dotnet run --project Content.Packaging client --no-wipe-release
+
+    - name: Update Build Info
+      run: |
+        chmod +x Tools/gen_build_info.py
+        Tools/gen_build_info.py
+
+    - name: Shuffle files around
+      run: |
+        mkdir "release/${{ github.sha }}"
+        mv release/*.zip "release/${{ github.sha }}"
+  
+    - name: Upload files to mothership
+      uses: burnett01/[email protected]
+      with:
+        switches: -avzr --ignore-existing
+        path: "release/${{ github.sha }}"
+        remote_path: ${{ secrets.BUILDS_PATH }}
+        remote_host: ${{ secrets.BUILDS_HOST }}
+        remote_port: ${{ secrets.BUILDS_PORT }}
+        remote_user: ${{ secrets.BUILDS_USERNAME }}
+        remote_key: ${{ secrets.BUILDS_SSH_KEY }}
+
+    - name: Update manifest JSON
+      uses: appleboy/[email protected]
+      with:
+        host: ${{ secrets.BUILDS_HOST }}
+        username: ${{ secrets.BUILDS_USERNAME }}
+        key: ${{ secrets.BUILDS_SSH_KEY }}
+        port: ${{ secrets.BUILDS_PORT }}
+        script: python3 ~/manifest.py --version ${{ github.sha }}
+
+    - name: Update CDN repository
+      run: |
+        curl -X POST -d "" -H 'Authorization: Bearer ${{ secrets.BUILDS_TOKEN }}' "http://${{ secrets.BUILDS_HOST }}:27690/control/update"
+      
+
+    #- name: Upload build artifact
+    #  id: artifact-upload-step
+    #  uses: actions/upload-artifact@v4
+    #  with:
+    #    name: build
+    #    path: release/*.zip
+    #    compression-level: 0
+    #    retention-days: 0
+
+    #- 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
+    #      env:
+    #        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    #        DISCORD_WEBHOOK_URL: ${{ secrets.CHANGELOG_DISCORD_WEBHOOK }}
+
+    #    - name: Publish changelog (RSS)
+    #      run: Tools/actions_changelog_rss.py
+    #      env:
+    #        CHANGELOG_RSS_KEY: ${{ secrets.CHANGELOG_RSS_KEY }}
+
+    #- uses: geekyeggo/delete-artifact@v5
+    #  if: always()
+    #  with:
+    #    name: build

.github/workflows/publish-publish.yml

@@ -6,27 +6,23 @@ name: Publish Public
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 1 * * *'
+  - cron: '0 1 * * *'
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Check configuration
-      env:
-        PUBLIC_PATH: ${{ secrets.BUILDS_PUBLIC_PATH }}
-      if: ${{ env.PUBLIC_PATH == '' }}
-      uses: andymckay/[email protected]
+#    - name: Install dependencies
+#      run: sudo apt-get install -y python3-paramiko python3-lxml
 
     - uses: actions/[email protected]
       with:
         submodules: 'recursive'
-
     - name: Setup .NET Core
       uses: actions/[email protected]
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - name: Get Engine Tag
       run: |
@@ -40,27 +36,40 @@ jobs:
       run: dotnet build Content.Packaging --configuration Release --no-restore /m
 
     - name: Package server
-      run: dotnet run --project Content.Packaging server --hybrid-acz --platform win-x64 --platform linux-x64 --platform osx-x64 --platform linux-arm64
+      run: dotnet run --project Content.Packaging server --platform win-x64 --platform linux-x64 --platform osx-x64 --platform linux-arm64
 
-    - name: Shuffle files around
-      run: |
-        mkdir "release/${{ github.sha }}"
-        mv release/SS14.Server*.zip "release/${{ github.sha }}"
+    - name: Package client
+      run: dotnet run --project Content.Packaging client --no-wipe-release
 
-    - name: Upload files to mothership
-      uses: burnett01/[email protected]
+    - name: Upload build artifact
+      id: artifact-upload-step
+      uses: actions/upload-artifact@v4
       with:
-        switches: -avzr --ignore-existing
-        path: "release/${{ github.sha }}"
-        remote_path: ${{ secrets.BUILDS_PUBLIC_PATH }}
-        remote_host: ${{ secrets.BUILDS_HOST }}
-        remote_user: ${{ secrets.BUILDS_USERNAME }}
-        remote_key: ${{ secrets.BUILDS_SSH_KEY }}
+        name: build
+        path: release/*.zip
+        compression-level: 0
+        retention-days: 0
+
+    - 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
+#      env:
+#        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#        DISCORD_WEBHOOK_URL: ${{ secrets.CHANGELOG_DISCORD_WEBHOOK }}
+
+#    - name: Publish changelog (RSS)
+#      run: Tools/actions_changelog_rss.py
+#      env:
+#        CHANGELOG_RSS_KEY: ${{ secrets.CHANGELOG_RSS_KEY }}
 
-    - name: Generate public HTML
-      uses: appleboy/ssh-action@master
+    - uses: geekyeggo/delete-artifact@v5
+      if: always()
       with:
-        host: ${{ secrets.BUILDS_HOST }}
-        username: ${{ secrets.BUILDS_USERNAME }}
-        key: ${{ secrets.BUILDS_SSH_KEY }}
-        script: node ~/scripts/generate_html_page.js -fork ${{ vars.FORK_ID_PUBLIC }} -id ${{ github.sha }}
+        name: build

.github/workflows/publish.yml

@@ -1,20 +1,24 @@
 name: Publish
 
-concurrency:
-  group: publish
+#concurrency:
+#  group: publish
 
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 6 * * *'
+  - cron: '0 6 * * *'
+  workflow_run:
+    workflows: [Build & Test Release]
+    types: [completed]
 
 jobs:
   build:
+    if: ${{ github.event.workflow_run.conclusion == 'success' || github.event_name == 'workflow_dispatch' }}
     runs-on: ubuntu-latest
 
     steps:
-#    - name: Install dependencies
-#      run: sudo apt-get install -y python3-paramiko python3-lxml
+    - name: Install dependencies
+      run: sudo apt-get install -y python3-paramiko python3-lxml
 
     - uses: actions/[email protected]
       with:
@@ -31,7 +35,7 @@ jobs:
         chmod 600 ~/.ssh/id_rsa
         echo "HOST *" > ~/.ssh/config
         echo "StrictHostKeyChecking no" >> ~/.ssh/config
-        git -c submodule.Secrets.update=checkout submodule update --init
+        git clone [email protected]:corvax-nexus/secrets.git Secrets
         cp -R Secrets/Resources/Prototypes Resources/Prototypes/CorvaxSecrets
         cp -R Secrets/Resources/ServerPrototypes Resources/Prototypes/CorvaxSecretsServer
         cp -R Secrets/Resources/Locale Resources/Locale/ru-RU/corvax-secrets
@@ -55,47 +59,75 @@ jobs:
       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
+      run: dotnet run --project Content.Packaging server --platform linux-x64
 
     - name: Package client
       run: dotnet run --project Content.Packaging client --no-wipe-release
-
+    
     - name: Update Build Info
-      env:
-        FORK_ID: ${{ vars.FORK_ID }}
-      run: Tools/gen_build_info.py
+      run: |
+        chmod +x Tools/gen_build_info.py
+        Tools/gen_build_info.py
 
     - name: Shuffle files around
       run: |
         mkdir "release/${{ github.sha }}"
         mv release/*.zip "release/${{ github.sha }}"
-
+  
     - name: Upload files to mothership
-      uses: burnett01/rsync-deployments@5.2
+      uses: burnett01/rsync-deployments@7.0.0
       with:
         switches: -avzr --ignore-existing
         path: "release/${{ github.sha }}"
         remote_path: ${{ secrets.BUILDS_PATH }}
         remote_host: ${{ secrets.BUILDS_HOST }}
+        remote_port: ${{ secrets.BUILDS_PORT }}
         remote_user: ${{ secrets.BUILDS_USERNAME }}
         remote_key: ${{ secrets.BUILDS_SSH_KEY }}
-
+  
     - name: Update manifest JSON
-      uses: appleboy/ssh-action@master
+      uses: appleboy/ssh-action@v1.0.3
       with:
         host: ${{ secrets.BUILDS_HOST }}
         username: ${{ secrets.BUILDS_USERNAME }}
         key: ${{ secrets.BUILDS_SSH_KEY }}
-        script: node ~/scripts/push_to_manifest.js -fork ${{ vars.FORK_ID }} -id ${{ github.sha }}
-
-#    - name: Publish changelog (Discord)
-#      run: Tools/actions_changelogs_since_last_run.py
-#      env:
-#        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#        DISCORD_WEBHOOK_URL: ${{ secrets.CHANGELOG_DISCORD_WEBHOOK }}
-#        TRANSLATION_API_URL: ${{ secrets.CHANGELOG_TRANSLATION_API_URL }}
-
-#    - name: Publish changelog (RSS)
-#      run: Tools/actions_changelog_rss.py
-#      env:
-#        CHANGELOG_RSS_KEY: ${{ secrets.CHANGELOG_RSS_KEY }}
+        port: ${{ secrets.BUILDS_PORT }}
+        script: python3 ~/manifest.py --version ${{ github.sha }}
+
+    - name: Update CDN repository
+      run: |
+        curl -X POST -d "" -H 'Authorization: Bearer ${{ secrets.BUILDS_TOKEN }}' "http://${{ secrets.BUILDS_HOST }}:27690/control/update"
+      
+
+    #- name: Upload build artifact
+    #  id: artifact-upload-step
+    #  uses: actions/upload-artifact@v4
+    #  with:
+    #    name: build
+    #    path: release/*.zip
+    #    compression-level: 0
+    #    retention-days: 0
+
+    #- 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
+    #      env:
+    #        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    #        DISCORD_WEBHOOK_URL: ${{ secrets.CHANGELOG_DISCORD_WEBHOOK }}
+
+    #    - name: Publish changelog (RSS)
+    #      run: Tools/actions_changelog_rss.py
+    #      env:
+    #        CHANGELOG_RSS_KEY: ${{ secrets.CHANGELOG_RSS_KEY }}
+
+    #- uses: geekyeggo/delete-artifact@v5
+    #  if: always()
+    #  with:
+    #    name: build