Merge branch 'master' into TheNormalnij/clang

Author: botder

.github/CODE_OF_CONDUCT.md

@@ -1 +1 @@
-Please refer to the [forum rules](https://forum.mtasa.com/topic/12275-forum-rules/).
+Please refer to the [forum rules](https://forum.multitheftauto.com/topic/12275-forum-rules/).

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -59,7 +59,7 @@ body:
       description: |
         Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
 
-        **Warning!** Do not post any personal information or sensitive logs here. You are responsible for redacting any personal information from the logs. If you need to post sensitive logs, you can use our [private log uploader](https://upload.mtasa.com/) which will only allow MTA staff to access the file, just paste the link to it here.
+        **Warning!** Do not post any personal information or sensitive logs here. You are responsible for redacting any personal information from the logs. If you need to post sensitive logs, you can use our [private log uploader](https://upload.multitheftauto.com/) which will only allow MTA staff to access the file, just paste the link to it here.
       render: shell
   - type: checkboxes
     id: terms

.github/SECURITY.md

@@ -7,7 +7,7 @@ Please submit your security vulnerabilities and cheats to our [private bugtracke
 
 Please do not submit vulnerabilities and cheats publicly, on GitHub or anywhere else.
 
-[private bugtracker]: https://forum.mtasa.com/forum/156-private-bugs/
+[private bugtracker]: https://forum.multitheftauto.com/forum/156-private-bugs/
 
 ## Bug Bounty
 
@@ -16,4 +16,4 @@ We also run a bug bounty programme. Please read
 
 Payment is by PayPal only -- please include your PayPal email when posting on the [private bugtracker].
 
-[bounty]: https://forum.mtasa.com/topic/66858-bounty-for-finding-security-flaws-and-working-cheats-in-mta/
+[bounty]: https://forum.multitheftauto.com/topic/66858-bounty-for-finding-security-flaws-and-working-cheats-in-mta/

.github/workflows/build.yaml

@@ -70,15 +70,10 @@ jobs:
     strategy:
       matrix:
         architecture: [x64, arm64]
-        include:
-        - architecture: x64
-          image-tag: latest
-        - architecture: arm64
-          image-tag: arm64
     name: linux-${{ matrix.architecture }}
     runs-on: ubuntu-latest
     container:
-      image: docker://ghcr.io/multitheftauto/mtasa-blue-build:${{ matrix.image-tag }}
+      image: docker://ghcr.io/multitheftauto/mtasa-blue-build:latest
     steps:
       - uses: actions/checkout@v4
 

.github/workflows/crowdin-auto-merge.yml

@@ -0,0 +1,31 @@
+name: Crowdin Auto-Merge
+
+on:
+  schedule:
+    - cron: '0 0 * * 5'  # This cron expression runs the workflow every Friday at midnight (UTC)
+  workflow_dispatch:
+
+jobs:
+  crowdin-auto-merge:
+    if: github.event.repository.fork == false
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.POT_CI_PAT }}
+
+      - name: Setup Git
+        run: |
+          git config --global user.name 'github-actions[bot]'
+          git config --global user.email 'github-actions[bot]@users.noreply.github.com'
+
+      - name: Auto-merge pull request
+        run: |
+          PR_NUMBER=$(gh pr list --repo ${{ github.repository }} --author 'MTABot' --base 'master' --head 'l10n/master' --state open --json number --jq '.[0].number')
+          if [ -n "$PR_NUMBER" ]; then
+            gh pr merge $PR_NUMBER --squash --repo ${{ github.repository }} --admin --subject "New Crowdin updates (PR #$PR_NUMBER)" --body ""
+            git push origin --delete l10n/master
+          fi
+        env:
+          GITHUB_TOKEN: ${{ secrets.POT_CI_PAT }}

.github/workflows/dockerimage.yaml

@@ -1,31 +1,18 @@
 name: Docker Image
 
 on: 
+  workflow_dispatch:
   push:
     branches:
     - master
     paths: 
     - '.github/workflows/build.yaml'
     - '.github/workflows/dockerimage.yaml'
-    - 'utils/compat/**'
-    - 'Dockerfile'
-    - 'Dockerfile.i386'
-    - 'Dockerfile.armhf'
-    - 'Dockerfile.arm64'
+    - 'utils/docker/**'
 
 jobs:
   build:
-    strategy:
-      matrix:
-        include:
-        - tag: latest
-          dockerfile: Dockerfile
-        - tag: i386
-          dockerfile: Dockerfile.i386
-        - tag: armhf
-          dockerfile: Dockerfile.armhf
-        - tag: arm64
-          dockerfile: Dockerfile.arm64
+    if: github.event.repository.fork == false
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
@@ -38,5 +25,5 @@ jobs:
     - uses: docker/build-push-action@v5
       with:
         push: true
-        file: ./${{ matrix.dockerfile }}
-        tags: ghcr.io/multitheftauto/mtasa-blue-build:${{ matrix.tag }}
+        context: utils/docker
+        tags: ghcr.io/multitheftauto/mtasa-blue-build:latest

.github/workflows/rebuild-pots.yaml

@@ -4,6 +4,7 @@ on: [push, workflow_dispatch]
 
 jobs:
   test:
+    if: github.event.repository.fork == false
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -23,6 +24,7 @@ jobs:
         run: pytest "utils/localization/tests"
         shell: bash -l {0}
   rebuild-pots:
+    if: github.event.repository.fork == false
     runs-on: ubuntu-latest
     needs: test
     steps:

.github/workflows/run-generate-translators.yaml

@@ -0,0 +1,52 @@
+name: "Update crowdin-translators.json"
+
+on:
+  workflow_dispatch:
+  delete:
+    branches:
+      - l10n/master
+
+jobs:
+  generate_translators:
+    if: github.event.repository.fork == false
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: master
+          token: ${{ secrets.POT_CI_PAT }}
+      
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: latest
+          cache: 'npm'
+          cache-dependency-path: ./utils/localization/generate-translators/package-lock.json
+      
+      - name: Install dependencies
+        working-directory: ./utils/localization/generate-translators
+        run: npm clean-install
+      
+      - name: Generate translators
+        working-directory: ./utils/localization/generate-translators
+        env:
+          CROWDIN_TOKEN: "${{ secrets.CROWDIN_TOKEN }}"
+          CROWDIN_ORGANIZATION: "multitheftauto"
+          CROWDIN_PROJECT_ID: "13"  # Multi Theft Auto
+          CROWDIN_IGNORE_USER_ID: "2"  # multitheftautoqa
+        run: npm run ci
+      
+      - name: Commit changes
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          git config --global user.name 'github-actions[bot]'
+          git config --global user.email 'github-actions[bot]@users.noreply.github.com'
+
+          git add ./utils/localization/generate-translators/crowdin-translators.json
+
+          if ! git diff-index --quiet HEAD; then
+            git commit -m "Update crowdin-translators.json" -m "[ci skip]"
+            git push
+          fi

.github/workflows/stale.yaml

@@ -6,6 +6,7 @@ on:
 
 jobs:
   stale:
+    if: github.event.repository.fork == false
     runs-on: ubuntu-latest
     steps:
       - uses: multitheftauto/[email protected]

.github/workflows/sync-master-to-maetro.yaml

@@ -7,6 +7,7 @@ on:
 
 jobs:
   sync-master-to-maetro:
+    if: github.event.repository.fork == false
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4