Skip to content

Commit

Permalink
Configure and enable bors (#14383)
Browse files Browse the repository at this point in the history
* Update build-test-debug.yml

* Update build-test-release.yml

* Update test-packaging.yml

* Update validate_mapfiles.yml

* Update yaml-linter.yml

* Update validate-rsis.yml

* Update validate-rgas.yml

* Create bors.toml
  • Loading branch information
moonheart08 authored Mar 4, 2023
1 parent beef2b2 commit 7232bf4
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-test-debug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Build & Test Debug

on:
push:
branches: [ master ]
branches: [ master, staging, trying ]
paths:
- '**.cs'
- '**.csproj'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-test-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Build & Test Release

on:
push:
branches: [ master ]
branches: [ master, staging, trying ]
paths:
- '**.cs'
- '**.csproj'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

on:
push:
branches: [ master ]
branches: [ master, staging, trying ]
paths:
- '**.cs'
- '**.csproj'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/validate-rgas.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: YAML schema validator
on:
push:
branches: [ master, staging, trying ]
merge_group:
pull_request:
types: [ opened, reopened, synchronize, ready_for_review ]
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/validate-rsis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
name: RSI Validator

on:
push:
branches: [ staging, trying ]
merge_group:
pull_request:
paths:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/validate_mapfiles.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: YAML schema validator
on:
push:
branches: [ master, staging, trying ]
merge_group:
pull_request:
types: [ opened, reopened, synchronize, ready_for_review ]
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/yaml-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: YAML Linter

on:
push:
branches: [ master, staging, trying ]
merge_group:
pull_request:
types: [ opened, reopened, synchronize, ready_for_review ]
Expand Down
3 changes: 3 additions & 0 deletions bors.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
status = [ "Build & Test Debug", "Build & Test Release", "Test Packaging", "YAML Linter", "YAML schema validator" ]
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 7232bf4

Please sign in to comment.