Update conflicts.yml (#27)

correct dm validation
Delete codeowner_reviews.yml
Add CI for modular_ss220

.github/workflows/ci_suite.yml

@@ -59,6 +59,7 @@ jobs:
           bash tools/ci/check_changelogs.sh
           bash tools/ci/check_grep.sh
           bash skyrat/tools/skyrat_check_grep.sh # SKYRAT EDIT ADDITION - checking modular_skyrat code
+          bash skyrat/tools/ss220_check_grep.sh # SS220 EDIT ADDITION - checking modular_ss220 code
           bash tools/ci/check_misc.sh
           tools/bootstrap/python tools/ticked_file_enforcement/ticked_file_enforcement.py < tools/ticked_file_enforcement/schemas/tgstation_dme.json
           tools/bootstrap/python tools/ticked_file_enforcement/ticked_file_enforcement.py < tools/ticked_file_enforcement/schemas/unit_tests.json

.github/workflows/conflicts.yml

@@ -0,0 +1,19 @@
+name: 'Merge Conflict Detection'
+on:
+  push:
+    branches:
+      - master
+      - 'project/**'
+  pull_request_target:
+    types: [ready_for_review, opened, synchronize, reopened]
+jobs:
+  triage:
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: eps1lon/[email protected]
+        with:
+          dirtyLabel: 'Merge Conflict'
+          repoToken: ${{ secrets.GITHUB_TOKEN }}

skyrat/tools/ss220_check_grep.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+#ANSI Escape Codes for colors to increase contrast of errors
+RED="\033[0;31m"
+GREEN="\033[0;32m"
+BLUE="\033[0;34m"
+NC="\033[0m" # No Color
+
+echo -e "${BLUE}Re-running grep checks, but looking in modular_ss220...${NC}"
+
+# Run the linters again, but modular skyrat code.
+sed "s|code/\*\*/\*\.dm|modular_ss220/\*\*/\*\.dm|g" <tools/ci/check_grep.sh | bash

tools/build/build.js

@@ -81,6 +81,7 @@ export const DmTarget = new Juke.Target({
     'icons/**',
     'interface/**',
     'modular_skyrat/**', ///SKYRAT EDIT ADDITION - Making the CBT work
+    'modular_ss220/**', ///SS220 EDIT ADDITION - Making the CBT work
     `${DME_NAME}.dme`,
     NamedVersionFile,
   ],