Merge branch 'master' into prison-headset

DeltaV-Station · Feb 13, 2024 · 937afd6 · 937afd6
2 parents 26d8fdc + 6687a31
commit 937afd6
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/build-map-renderer.yml b/.github/workflows/build-map-renderer.yml
@@ -10,7 +10,7 @@ on:
 
 jobs:
   build:
-    if: github.actor != 'PJBot' && github.event.pull_request.draft == false
+    if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot'
     strategy:
       matrix:
         os: [ubuntu-latest]

diff --git a/.github/workflows/build-test-debug.yml b/.github/workflows/build-test-debug.yml
@@ -10,7 +10,7 @@ on:
 
 jobs:
   build:
-    if: github.actor != 'PJBot' && github.event.pull_request.draft == false
+    if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot'
     strategy:
       matrix:
         os: [ubuntu-latest]

diff --git a/.github/workflows/conflict-labeler.yml b/.github/workflows/conflict-labeler.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   Label:
-    if: github.actor != 'PJBot'
+    if: github.actor != 'PJBot' && github.actor != 'DeltaV-Bot'
     runs-on: ubuntu-latest
     steps:
       - name: Check for Merge Conflicts

diff --git a/.github/workflows/labeler-pr.yml b/.github/workflows/labeler-pr.yml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   labeler:
-    if: github.actor != 'PJBot'
+    if: github.actor != 'PJBot' && github.actor != 'DeltaV-Bot'
     runs-on: ubuntu-latest
     steps:
     - uses: actions/labeler@v3

diff --git a/.github/workflows/test-packaging.yml b/.github/workflows/test-packaging.yml
@@ -29,7 +29,7 @@ on:
 jobs:
   build:
     name: Test Packaging
-    if: github.actor != 'PJBot' && github.event.pull_request.draft == false
+    if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot'
     runs-on: ubuntu-latest
 
     steps:

diff --git a/.github/workflows/validate-rgas.yml b/.github/workflows/validate-rgas.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   yaml-schema-validation:
     name: YAML RGA schema validator
-    if: github.actor != 'PJBot' && github.event.pull_request.draft == false
+    if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot'
     runs-on: ubuntu-latest
     steps:
     - uses: actions/[email protected]

diff --git a/.github/workflows/validate_mapfiles.yml b/.github/workflows/validate_mapfiles.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   yaml-schema-validation:
     name: YAML map schema validator
-    if: github.actor != 'PJBot' && github.event.pull_request.draft == false
+    if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot'
     runs-on: ubuntu-latest
     steps:
     - uses: actions/[email protected]

diff --git a/.github/workflows/yaml-linter.yml b/.github/workflows/yaml-linter.yml
@@ -10,7 +10,7 @@ on:
 jobs:
   build:
     name: YAML Linter
-    if: github.actor != 'PJBot' && github.event.pull_request.draft == false
+    if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/[email protected]