Merge branch 'master' into fix-ascii2text

OpenDreamProject · Feb 9, 2024 · e630eda · e630eda
2 parents f2ce028 + b5670f2
commit e630eda
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/.github/boring-cyborg.yml b/.github/boring-cyborg.yml
@@ -0,0 +1,11 @@
+labelPRBasedOnFilePath:
+  Client:
+    - OpenDreamClient/**/*
+    - OpenDreamShared/**/*
+  Runtime:
+    - OpenDreamRuntime/**/*
+    - OpenDreamServer/**/*
+    - OpenDreamShared/**/*
+  Compiler:
+    - OpenDreamCompiler/**/*
+    - DMDissasembler/**/*
diff --git a/.github/workflows/pr-labeler.yml b/.github/workflows/pr-labeler.yml
@@ -17,6 +17,7 @@ jobs:
           repoToken: "${{ secrets.GITHUB_TOKEN }}"
           commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
       - name: Apply Size Label
+        if: ${{ github.ref != 'refs/heads/master' }}
         uses: pascalgn/[email protected]
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"