diff --git a/.github/workflows/build-test-debug.yml b/.github/workflows/build-test-debug.yml index cdfed598f1..fa3e7e7c25 100644 --- a/.github/workflows/build-test-debug.yml +++ b/.github/workflows/build-test-debug.yml @@ -2,7 +2,7 @@ name: Build & Test Debug on: push: - branches: [ master ] + branches: [ master, staging, trying ] paths: - '**.cs' - '**.csproj' diff --git a/.github/workflows/build-test-release.yml b/.github/workflows/build-test-release.yml index 33a513110c..8f08e12065 100644 --- a/.github/workflows/build-test-release.yml +++ b/.github/workflows/build-test-release.yml @@ -2,7 +2,7 @@ name: Build & Test Release on: push: - branches: [ master ] + branches: [ master, staging, trying ] paths: - '**.cs' - '**.csproj' diff --git a/.github/workflows/test-packaging.yml b/.github/workflows/test-packaging.yml index 0dc33982b7..22bc6fc94a 100644 --- a/.github/workflows/test-packaging.yml +++ b/.github/workflows/test-packaging.yml @@ -2,7 +2,7 @@ on: push: - branches: [ master ] + branches: [ master, staging, trying ] paths: - '**.cs' - '**.csproj' diff --git a/.github/workflows/validate-rgas.yml b/.github/workflows/validate-rgas.yml index 4143721fc6..c346c2a4c6 100644 --- a/.github/workflows/validate-rgas.yml +++ b/.github/workflows/validate-rgas.yml @@ -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 ] diff --git a/.github/workflows/validate-rsis.yml b/.github/workflows/validate-rsis.yml index 28102b8188..5b9fddff33 100644 --- a/.github/workflows/validate-rsis.yml +++ b/.github/workflows/validate-rsis.yml @@ -1,6 +1,8 @@ name: RSI Validator on: + push: + branches: [ staging, trying ] merge_group: pull_request: paths: diff --git a/.github/workflows/validate_mapfiles.yml b/.github/workflows/validate_mapfiles.yml index 1258fe01d4..9a9833ca6c 100644 --- a/.github/workflows/validate_mapfiles.yml +++ b/.github/workflows/validate_mapfiles.yml @@ -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 ] diff --git a/.github/workflows/yaml-linter.yml b/.github/workflows/yaml-linter.yml index e55639a795..2ec63caae8 100644 --- a/.github/workflows/yaml-linter.yml +++ b/.github/workflows/yaml-linter.yml @@ -2,6 +2,7 @@ name: YAML Linter on: push: + branches: [ master, staging, trying ] merge_group: pull_request: types: [ opened, reopened, synchronize, ready_for_review ] diff --git a/bors.toml b/bors.toml new file mode 100644 index 0000000000..3356b7f0bf --- /dev/null +++ b/bors.toml @@ -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