Merge branch 'master' into tts-component

.github/workflows/ci.yml

@@ -6,6 +6,7 @@ on:
   pull_request:
     branches:
     - master
+  merge_group:
 
 jobs:
   run_linters:
@@ -36,6 +37,7 @@ jobs:
           python tools/ci/check_file_names.py
           python tools/ci/unticked_files.py ${GITHUB_WORKSPACE}
           python tools/ci/illegal_dme_files.py ${GITHUB_WORKSPACE}
+          python tools/ci/define_sanity.py
           python -m tools.ci.check_icon_conflicts
           python -m tools.ci.check_icon_dupenames
           python -m tools.maplint.source --github

.github/workflows/merge_upstream_master.yml

@@ -0,0 +1,44 @@
+name: Merge Upstream Master
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  merge-upstream:
+    if: ${{ github.event.issue.pull_request && github.event.comment.body == '!merge_upstream' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: PR Data
+        run: |
+          curl -H "Authorization: token ${{ github.token }}" ${{ github.event.issue.pull_request.url }} > pr.json
+          echo "PR_REPO=`jq -r '.head.repo.full_name' < pr.json`" >> $GITHUB_ENV
+          echo "PR_BRANCH=`jq -r '.head.ref' < pr.json`" >> $GITHUB_ENV
+
+      - uses: actions/checkout@v4
+        with:
+          repository: ${{ env.PR_REPO }}
+          ref: ${{ env.PR_BRANCH }}
+          fetch-depth: 0
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+
+      - name: Perform Merge
+        run: |
+          chmod +x tools/bootstrap/python
+          bash tools/hooks/install.sh
+          bash tgui/bin/tgui --install-git-hooks
+          chmod +x tools/hooks/*.merge tgui/bin/tgui
+          git config user.name github-actions
+          git config user.email [email protected]
+          git remote add upstream "https://github.com/${{ github.repository }}.git"
+          git fetch upstream master
+          git merge upstream/master && git push origin
+
+      - name: Notify Failure
+        if: failure()
+        run: |
+          curl -s -H "Authorization: token ${{ github.token }}" \
+            -X POST -d '{"body": "Merging upstream failed:\nhttps://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"}' \
+            "https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.issue.number }}/comments"

.vscode/tasks.json

@@ -1,35 +1,14 @@
 {
 	"version": "2.0.0",
 	"tasks": [
-		{
-			"type": "shell",
-			"command": "paracode/linters/check_grep2",
-			"windows": {
-				"command": ".\\tools\\bootstrap\\python.bat .\\tools\\ci\\check_grep2.py ${relativeFile}",
-			},
-			"problemMatcher": {
-				"owner": "dm",
-				"fileLocation": "relative",
-				"pattern": {
-					"regexp": "^(.*):(\\d+):\\s+(.*)$",
-					"file": 1,
-					"line": 2,
-					"message": 3,
-				}
-			},
-			"label": "linters: run check_grep2"
-		},
 		{
 			"type": "dreammaker",
 			"dme": "paradise.dme",
 			"problemMatcher": [
 				"$dreammaker"
 			],
 			"group": "build",
-			"label": "dm: build - paradise.dme",
-			"dependsOn": [
-				"linters: run check_grep2",
-			]
+			"label": "dm: build - paradise.dme"
 		},
 		{
 			"type": "shell",
@@ -57,5 +36,6 @@
 			"group": "build",
 			"label": "tgui: run dev server"
 		}
+		,
 	]
 }