From 028fa395d850ddf1206995141554a0a47f6e8b2e Mon Sep 17 00:00:00 2001
From: Moony <moony@hellomouse.net>
Date: Sat, 4 Mar 2023 23:56:55 +0000
Subject: [PATCH] fix bors config (#14389)

i did an oops
---
 .github/workflows/build-test-debug.yml   | 27 +++++++-----------------
 .github/workflows/build-test-release.yml | 26 +++++++----------------
 .github/workflows/test-packaging.yml     |  1 +
 .github/workflows/validate-rgas.yml      |  1 +
 .github/workflows/validate_mapfiles.yml  |  1 +
 .github/workflows/yaml-linter.yml        |  1 +
 bors.toml                                | 10 ++++++++-
 7 files changed, 29 insertions(+), 38 deletions(-)

diff --git a/.github/workflows/build-test-debug.yml b/.github/workflows/build-test-debug.yml
index fa3e7e7c254..3a3d93b7fb1 100644
--- a/.github/workflows/build-test-debug.yml
+++ b/.github/workflows/build-test-debug.yml
@@ -3,29 +3,10 @@ name: Build & Test Debug
 on:
   push:
     branches: [ master, staging, trying ]
-    paths:
-      - '**.cs'
-      - '**.csproj'
-      - '**.sln'
-      - '**.git**'
-      - '**.yml'
-      # no docs on which one of these is supposed to work, so
-      # why not just do both
-      - 'RobustToolbox'
-      - 'RobustToolbox/**'
   merge_group:
   pull_request:
     types: [ opened, reopened, synchronize, ready_for_review ]
     branches: [ master ]
-    paths:
-      - '**.cs'
-      - '**.csproj'
-      - '**.sln'
-      - '**.git**'
-      - '**.yml'
-      - 'RobustToolbox'
-      - 'RobustToolbox/**'
-
 
 jobs:
   build:
@@ -71,3 +52,11 @@ jobs:
       run: |
         $env:DOTNET_gcServer=1
         dotnet test --no-build Content.IntegrationTests/Content.IntegrationTests.csproj -- NUnit.ConsoleOut=0
+  ci-success:
+    name: Build & Test Debug
+    needs:
+      - build
+    runs-on: ubuntu-latest
+    steps:
+      - name: CI succeeded
+        run: exit 0
diff --git a/.github/workflows/build-test-release.yml b/.github/workflows/build-test-release.yml
index 8f08e12065e..1658a57d5cd 100644
--- a/.github/workflows/build-test-release.yml
+++ b/.github/workflows/build-test-release.yml
@@ -3,28 +3,10 @@ name: Build & Test Release
 on:
   push:
     branches: [ master, staging, trying ]
-    paths:
-      - '**.cs'
-      - '**.csproj'
-      - '**.sln'
-      - '**.git**'
-      - '**.yml'
-      # no docs on which one of these is supposed to work, so
-      # why not just do both
-      - 'RobustToolbox'
-      - 'RobustToolbox/**'
   merge_group:
   pull_request:
     types: [ opened, reopened, synchronize, ready_for_review ]
     branches: [ master ]
-    paths:
-      - '**.cs'
-      - '**.csproj'
-      - '**.sln'
-      - '**.git**'
-      - '**.yml'
-      - 'RobustToolbox'
-      - 'RobustToolbox/**'
 
 jobs:
   build:
@@ -70,3 +52,11 @@ jobs:
       run: |
         $env:DOTNET_gcServer=1
         dotnet test --no-build Content.IntegrationTests/Content.IntegrationTests.csproj -- NUnit.ConsoleOut=0
+  ci-success:
+    name: Build & Test Release
+    needs:
+      - build
+    runs-on: ubuntu-latest
+    steps:
+      - name: CI succeeded
+        run: exit 0
diff --git a/.github/workflows/test-packaging.yml b/.github/workflows/test-packaging.yml
index 22bc6fc94a1..4afaabf10c2 100644
--- a/.github/workflows/test-packaging.yml
+++ b/.github/workflows/test-packaging.yml
@@ -28,6 +28,7 @@ on:
 
 jobs:
   build:
+    name: Test Packaging
     if: github.actor != 'PJBot' && github.event.pull_request.draft == false
     runs-on: ubuntu-latest
 
diff --git a/.github/workflows/validate-rgas.yml b/.github/workflows/validate-rgas.yml
index c346c2a4c65..a06d3793e78 100644
--- a/.github/workflows/validate-rgas.yml
+++ b/.github/workflows/validate-rgas.yml
@@ -8,6 +8,7 @@ on:
 
 jobs:
   yaml-schema-validation:
+    name: YAML RGA schema validator
     if: github.actor != 'PJBot' && github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
diff --git a/.github/workflows/validate_mapfiles.yml b/.github/workflows/validate_mapfiles.yml
index 9a9833ca6cc..e849d2a53eb 100644
--- a/.github/workflows/validate_mapfiles.yml
+++ b/.github/workflows/validate_mapfiles.yml
@@ -8,6 +8,7 @@ on:
 
 jobs:
   yaml-schema-validation:
+    name: YAML map schema validator
     if: github.actor != 'PJBot' && github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
diff --git a/.github/workflows/yaml-linter.yml b/.github/workflows/yaml-linter.yml
index 2ec63caae8c..8634dc473e0 100644
--- a/.github/workflows/yaml-linter.yml
+++ b/.github/workflows/yaml-linter.yml
@@ -9,6 +9,7 @@ on:
 
 jobs:
   build:
+    name: YAML Linter
     if: github.actor != 'PJBot' && github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
diff --git a/bors.toml b/bors.toml
index 3356b7f0bfa..96239e25156 100644
--- a/bors.toml
+++ b/bors.toml
@@ -1,3 +1,11 @@
-status = [ "Build & Test Debug", "Build & Test Release", "Test Packaging", "YAML Linter", "YAML schema validator" ]
+status = [ 
+  "Build & Test Debug",
+  "Build & Test Release",
+  "Test Packaging",
+  "YAML Linter",
+  "YAML RGA schema validator",
+  "YAML map schema validator",
+  "Validate RSIs",
+]
 timeout_sec = 1800 # 30 minutes
 use_squash_merge = true # Shame this can't use GH squash but what can you do