From d872ac4ef0379a4d59af1f2f1d762eae5410a860 Mon Sep 17 00:00:00 2001
From: dj-34 <dj-34@bk.ru>
Date: Thu, 4 May 2023 17:11:19 +0500
Subject: [PATCH] Update conflicts.yml (#27) correct dm validation Delete
 codeowner_reviews.yml Add CI for modular_ss220

---
 .github/workflows/ci_suite.yml          |  1 +
 .github/workflows/codeowner_reviews.yml | 26 -------------------------
 .github/workflows/conflicts.yml         | 19 ++++++++++++++++++
 skyrat/tools/ss220_check_grep.sh        | 12 ++++++++++++
 tools/build/build.js                    |  1 +
 5 files changed, 33 insertions(+), 26 deletions(-)
 delete mode 100644 .github/workflows/codeowner_reviews.yml
 create mode 100644 .github/workflows/conflicts.yml
 create mode 100644 skyrat/tools/ss220_check_grep.sh

diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml
index 3197a54b9f19f95..735c0f0ff4a80bf 100644
--- a/.github/workflows/ci_suite.yml
+++ b/.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
diff --git a/.github/workflows/codeowner_reviews.yml b/.github/workflows/codeowner_reviews.yml
deleted file mode 100644
index a461a96d931f695..000000000000000
--- a/.github/workflows/codeowner_reviews.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: Codeowner Reviews
-
-# Controls when the workflow will run
-on: pull_request_target
-
-jobs:
-  assign-users:
-
-    runs-on: ubuntu-latest
-
-    steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so the job can access it
-      - uses: actions/checkout@v3
-
-      #Parse the Codeowner file
-      - name: CodeOwnersParser
-        id: CodeOwnersParser
-        uses: tgstation/CodeOwnersParser@v1
-
-      #Request reviews
-      - name: Request reviews
-        if: steps.CodeOwnersParser.outputs.owners != ''
-        uses: tgstation/RequestReviewFromUser@v1
-        with:
-          separator: ' '
-          users: ${{ steps.CodeOwnersParser.outputs.owners }}
diff --git a/.github/workflows/conflicts.yml b/.github/workflows/conflicts.yml
new file mode 100644
index 000000000000000..d21e8d7a17ec2a2
--- /dev/null
+++ b/.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/actions-label-merge-conflict@v2.1.0
+        with:
+          dirtyLabel: 'Merge Conflict'
+          repoToken: ${{ secrets.GITHUB_TOKEN }}
diff --git a/skyrat/tools/ss220_check_grep.sh b/skyrat/tools/ss220_check_grep.sh
new file mode 100644
index 000000000000000..4b716c7a585c389
--- /dev/null
+++ b/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
diff --git a/tools/build/build.js b/tools/build/build.js
index c7f31fd0ec5ac96..883b4ddfc7f067b 100644
--- a/tools/build/build.js
+++ b/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,
   ],