Merge branch 'LandSandBoat:base' into base

Author: Lydya-nick77

.clang-format

@@ -1,7 +1,7 @@
 ---
 # https://clang.llvm.org/docs/ClangFormatStyleOptions.html
 # We base things of WebKit + Allman braces
-# Compatible with clang-format-20
+# Compatible with clang-format-22 (enforced by tools/run_clang_format.py)
 Language: Cpp
 
 # Access modifiers
@@ -28,8 +28,7 @@ AllowShortFunctionsOnASingleLine: None
 AllowShortIfStatementsOnASingleLine: Never
 AllowShortLambdasOnASingleLine: None
 AllowShortLoopsOnASingleLine: false
-
-# Note: LambdaBodyIndentation not available in clang-format-20
+LambdaBodyIndentation: Signature
 
 # Template declarations
 AlwaysBreakTemplateDeclarations: Yes
@@ -71,6 +70,8 @@ BinPackParameters: false
 # Namespaces
 CompactNamespaces: false
 NamespaceIndentation: None
+WrapNamespaceBodyWithEmptyLines: Always
+SeparateDefinitionBlocks: Always
 
 # Braced lists and initializers
 Cpp11BracedListStyle: false
@@ -89,8 +90,7 @@ MaxEmptyLinesToKeep: 1
 # Pointer and reference alignment
 PointerAlignment: Left
 ReferenceAlignment: Pointer
-
-# Note: QualifierAlignment not available in clang-format-20, use manual const placement
+QualifierAlignment: Left # West Const
 
 # Comments
 ReflowComments: Always

.devcontainer/devcontainer.json

@@ -11,7 +11,9 @@
     "remoteUser": "xiadmin",
     "remoteEnv": { "LOCAL_WORKSPACE_FOLDER": "${localWorkspaceFolder}" },
     "features": {
-        "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {}
+        "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {
+            "moby": false
+        }
     },
     "customizations": {
             "vscode": {

.editorconfig

@@ -80,6 +80,18 @@ indent_brace_style = allman # This is unfortunately ignored in Visual Studio
 [Makefile]
 indent_style = tab
 
-[*.yml]
+[*.{yml,yaml}]
 indent_style = space
 indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.json]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true

.github/workflows/build.yml

@@ -15,9 +15,9 @@ jobs:
     name: Clang Tidy
     uses: ./.github/workflows/runner_build.yml
     with:
-      runner: ubuntu-24.04
+      runner: ubuntu-26.04
       compiler: clang
-      compiler_version: 20
+      compiler_version: 22
       build_type: Debug
       tracy: false
       build_modules: false
@@ -64,9 +64,9 @@ jobs:
             upload_artifact: false
             clang_tidy: false
           - build_type: Debug
-            runner: ubuntu-24.04
+            runner: ubuntu-26.04
             compiler: gcc
-            compiler_version: 14
+            compiler_version: 15
             tracy: false
             build_modules: false
             save_cache: true
@@ -93,8 +93,8 @@ jobs:
           - build_type: Release
             os: ubuntu
             compiler: gcc
-            compiler_version: 14
-            clang_format_version: 20
+            compiler_version: 15
+            clang_format_version: 22
             tracy: false
             build_modules: false
             save_cache: false
@@ -110,8 +110,8 @@ jobs:
           - build_type: Release
             os: alpine
             compiler: clang
-            compiler_version: 20
-            clang_format_version: 20
+            compiler_version: 22
+            clang_format_version: 22
             tracy: false
             build_modules: false
             save_cache: false

.github/workflows/changelog.yml

@@ -9,14 +9,15 @@ on:
 jobs:
   Publish_Changelog:
     name: Generate and Publish Changelog
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
-    - uses: fregante/setup-git-user@v1
+    - uses: actions/checkout@v6
+    - run: git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
+    - run: git config --global user.name "github-actions[bot]"
     - name: Install dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install -y python3.7
+        sudo apt-get install -y python3
         pip3 install requests
     - name: Generate changelog
       run: |

.github/workflows/check_template.yml

@@ -13,7 +13,7 @@ jobs:
     permissions: write-all
     steps:
     - name: Comment on unchecked boxes in template
-      uses: actions/github-script@v7
+      uses: actions/github-script@v9
       with:
         script: |
           function count_instances(string, word)

.github/workflows/codeql_analysis.yml

@@ -36,16 +36,16 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v6
 
     - name: Install Dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install -y software-properties-common cmake libmariadb-dev-compat libluajit-5.1-dev libzmq3-dev zlib1g-dev libssl-dev binutils-dev
+        sudo apt-get install -y software-properties-common cmake libmariadb-dev-compat libluajit-5.1-dev libzmq3-dev zlib1g-dev libssl-dev binutils-dev libzstd-dev
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v4
       with:
         trap-caching: false
         languages: ${{ matrix.language }}
@@ -57,7 +57,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     # - name: Autobuild
-    #   uses: github/codeql-action/autobuild@v2
+    #   uses: github/codeql-action/autobuild@v4
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -73,7 +73,7 @@ jobs:
         cmake --build build -j4
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v4
       with:
         # https://josh-ops.com/posts/github-codeql-ignore-files/
         upload: false # disable the upload here - we will upload in a different action
@@ -89,6 +89,6 @@ jobs:
         output: sarif-results/${{ matrix.language }}.sarif
 
     - name: Upload SARIF
-      uses: github/codeql-action/upload-sarif@v2
+      uses: github/codeql-action/upload-sarif@v4
       with:
         sarif_file: sarif-results/${{ matrix.language }}.sarif

.github/workflows/discussion_keyword_comment.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Comment on keywords in Discussion
-      uses: actions/github-script@v6
+      uses: actions/github-script@v9
       with:
         script: |
           // Define the keywords to check (all lower-case for case-insensitive matching)

.github/workflows/docker_build.yml

@@ -67,13 +67,13 @@ jobs:
           echo "REPO_OWNER=${GITHUB_REPOSITORY_OWNER,,}" >>${GITHUB_ENV}
           echo "REPO=${GITHUB_REPOSITORY,,}" >>${GITHUB_ENV}
 
-      - uses: docker/login-action@v3
+      - uses: docker/login-action@v4
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 1
 
@@ -88,12 +88,12 @@ jobs:
               f.write("renamer\n")
           EOF
 
-      - uses: docker/setup-buildx-action@v3
+      - uses: docker/setup-buildx-action@v4
         id: setup_buildx
 
       - name: Restore build cache
         if: ${{ !inputs.save_cache }}
-        uses: actions/cache/restore@v4
+        uses: actions/cache/restore@v5
         env:
           cmake_hash: ${{ hashFiles('**/CMakeLists.txt', '**/*.cmake') }}
           source_hash: ${{ hashFiles('src/**/*', 'ext/**/*') }}
@@ -108,7 +108,7 @@ jobs:
       - name: Cache build
         id: cache_build
         if: ${{ inputs.save_cache }}
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         env:
           cmake_hash: ${{ hashFiles('**/CMakeLists.txt', '**/*.cmake') }}
           source_hash: ${{ hashFiles('src/**/*', 'ext/**/*') }}
@@ -121,7 +121,7 @@ jobs:
             ${{ format('buildcache-docker-{0}-{1}{2}-{3}-{4}-', inputs.os, inputs.compiler, inputs.compiler_version, inputs.build_type, env.cmake_hash) }}
 
       - name: Inject cache into container
-        uses: reproducible-containers/buildkit-cache-dance@v3.2.0
+        uses: reproducible-containers/buildkit-cache-dance@v3.4.0
         with:
           builder: ${{ steps.setup_buildx.outputs.name }}
           cache-map: |
@@ -145,7 +145,7 @@ jobs:
 
       - name: Docker meta
         id: docker-meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
         with:
           images: ghcr.io/${{ env.REPO }}
           tags: |
@@ -161,7 +161,7 @@ jobs:
 
       - name: Build devtools image
         if: ${{ inputs.publish && vars.PUBLISH_DOCKER != '' }}
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           context: .
           file: ${{ format('./docker/{0}.Dockerfile', inputs.os) }}
@@ -173,7 +173,7 @@ jobs:
           tags: ${{ format('ghcr.io/{0}/devtools:{1}', env.REPO_OWNER, inputs.os) }}
 
       - name: Docker build and push
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           context: .
           file: ${{ format('./docker/{0}.Dockerfile', inputs.os) }}
@@ -194,7 +194,7 @@ jobs:
 
       - name: Archive image
         if: ${{ inputs.upload_artifact || (inputs.publish && vars.PUBLISH_DOCKER == '') }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: ${{ format('LSB_{0}_image_{1}', inputs.os, github.sha) }}
           path: ${{ format('{0}/LSB_{1}_image_{2}.tar', runner.temp, inputs.os, github.sha) }}

.github/workflows/docker_test.yml

@@ -57,21 +57,21 @@ jobs:
           echo "REPO_OWNER=${GITHUB_REPOSITORY_OWNER,,}" >>${GITHUB_ENV}
           echo "REPO=${GITHUB_REPOSITORY,,}" >>${GITHUB_ENV}
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 1
           submodules: recursive # For navmeshes
 
       - name: Download artifact
         if: ${{ github.event_name == 'pull_request' }}
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: ${{ env.artifact_name }}
           path: ${{ runner.temp }}
 
       - name: Download previous artifact
         if: ${{ (github.event_name == 'workflow_run' || github.event_name == 'workflow_dispatch') && vars.PUBLISH_DOCKER == ''}}
-        uses: dawidd6/action-download-artifact@v3
+        uses: dawidd6/action-download-artifact@v21
         with:
           run_id: ${{ github.event.workflow_run.id }}
           name: ${{ env.artifact_name }}