Skip to content

Commit 937afd6

Browse files
authored
Merge branch 'master' into prison-headset
2 parents 26d8fdc + 6687a31 commit 937afd6

8 files changed

+8
-8
lines changed

.github/workflows/build-map-renderer.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010

1111
jobs:
1212
build:
13-
if: github.actor != 'PJBot' && github.event.pull_request.draft == false
13+
if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot'
1414
strategy:
1515
matrix:
1616
os: [ubuntu-latest]

.github/workflows/build-test-debug.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010

1111
jobs:
1212
build:
13-
if: github.actor != 'PJBot' && github.event.pull_request.draft == false
13+
if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot'
1414
strategy:
1515
matrix:
1616
os: [ubuntu-latest]

.github/workflows/conflict-labeler.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
Label:
11-
if: github.actor != 'PJBot'
11+
if: github.actor != 'PJBot' && github.actor != 'DeltaV-Bot'
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Check for Merge Conflicts

.github/workflows/labeler-pr.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55

66
jobs:
77
labeler:
8-
if: github.actor != 'PJBot'
8+
if: github.actor != 'PJBot' && github.actor != 'DeltaV-Bot'
99
runs-on: ubuntu-latest
1010
steps:
1111
- uses: actions/labeler@v3

.github/workflows/test-packaging.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ on:
2929
jobs:
3030
build:
3131
name: Test Packaging
32-
if: github.actor != 'PJBot' && github.event.pull_request.draft == false
32+
if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot'
3333
runs-on: ubuntu-latest
3434

3535
steps:

.github/workflows/validate-rgas.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
jobs:
1010
yaml-schema-validation:
1111
name: YAML RGA schema validator
12-
if: github.actor != 'PJBot' && github.event.pull_request.draft == false
12+
if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot'
1313
runs-on: ubuntu-latest
1414
steps:
1515
- uses: actions/[email protected]

.github/workflows/validate_mapfiles.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
jobs:
1010
yaml-schema-validation:
1111
name: YAML map schema validator
12-
if: github.actor != 'PJBot' && github.event.pull_request.draft == false
12+
if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot'
1313
runs-on: ubuntu-latest
1414
steps:
1515
- uses: actions/[email protected]

.github/workflows/yaml-linter.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
jobs:
1111
build:
1212
name: YAML Linter
13-
if: github.actor != 'PJBot' && github.event.pull_request.draft == false
13+
if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot'
1414
runs-on: ubuntu-latest
1515
steps:
1616
- uses: actions/[email protected]

0 commit comments

Comments
 (0)