Skip to content

Commit

Permalink
fix bors config (#14389)
Browse files Browse the repository at this point in the history
i did an oops
  • Loading branch information
moonheart08 committed Mar 4, 2023
1 parent edd272b commit 028fa39
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 38 deletions.
27 changes: 8 additions & 19 deletions .github/workflows/build-test-debug.yml
Expand Up @@ -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:
Expand Down Expand Up @@ -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
26 changes: 8 additions & 18 deletions .github/workflows/build-test-release.yml
Expand Up @@ -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:
Expand Down Expand Up @@ -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
1 change: 1 addition & 0 deletions .github/workflows/test-packaging.yml
Expand Up @@ -28,6 +28,7 @@ on:

jobs:
build:
name: Test Packaging
if: github.actor != 'PJBot' && github.event.pull_request.draft == false
runs-on: ubuntu-latest

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/validate-rgas.yml
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/validate_mapfiles.yml
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/yaml-linter.yml
Expand Up @@ -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:
Expand Down
10 changes: 9 additions & 1 deletion 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

0 comments on commit 028fa39

Please sign in to comment.