From 202680ac563f9e349d8a32f32a03f3611cc0b02c Mon Sep 17 00:00:00 2001 From: Moony Date: Thu, 9 Feb 2023 10:35:34 -0600 Subject: [PATCH] Enable merge group checks for our workflows. (#14005) * Enable merge group checks for our workflows. * Update build-test-release.yml * Update validate-rgas.yml * Update validate-rsis.yml * Update validate_mapfiles.yml * Update yaml-linter.yml * Update test-packaging.yml --- .github/workflows/build-test-debug.yml | 2 ++ .github/workflows/build-test-release.yml | 1 + .github/workflows/test-packaging.yml | 1 + .github/workflows/validate-rgas.yml | 1 + .github/workflows/validate-rsis.yml | 1 + .github/workflows/validate_mapfiles.yml | 1 + .github/workflows/yaml-linter.yml | 1 + 7 files changed, 8 insertions(+) diff --git a/.github/workflows/build-test-debug.yml b/.github/workflows/build-test-debug.yml index 1ae02a772e..cdfed598f1 100644 --- a/.github/workflows/build-test-debug.yml +++ b/.github/workflows/build-test-debug.yml @@ -13,6 +13,7 @@ on: # why not just do both - 'RobustToolbox' - 'RobustToolbox/**' + merge_group: pull_request: types: [ opened, reopened, synchronize, ready_for_review ] branches: [ master ] @@ -25,6 +26,7 @@ on: - 'RobustToolbox' - 'RobustToolbox/**' + jobs: build: if: github.actor != 'PJBot' && github.event.pull_request.draft == false diff --git a/.github/workflows/build-test-release.yml b/.github/workflows/build-test-release.yml index 6964cb7cd6..33a513110c 100644 --- a/.github/workflows/build-test-release.yml +++ b/.github/workflows/build-test-release.yml @@ -13,6 +13,7 @@ on: # why not just do both - 'RobustToolbox' - 'RobustToolbox/**' + merge_group: pull_request: types: [ opened, reopened, synchronize, ready_for_review ] branches: [ master ] diff --git a/.github/workflows/test-packaging.yml b/.github/workflows/test-packaging.yml index 377abc9dc1..0dc33982b7 100644 --- a/.github/workflows/test-packaging.yml +++ b/.github/workflows/test-packaging.yml @@ -13,6 +13,7 @@ on: # why not just do both - 'RobustToolbox' - 'RobustToolbox/**' + merge_group: pull_request: types: [ opened, reopened, synchronize, ready_for_review ] branches: [ master ] diff --git a/.github/workflows/validate-rgas.yml b/.github/workflows/validate-rgas.yml index fa7873798c..4143721fc6 100644 --- a/.github/workflows/validate-rgas.yml +++ b/.github/workflows/validate-rgas.yml @@ -1,6 +1,7 @@ name: YAML schema validator on: push: + 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 85e6173625..28102b8188 100644 --- a/.github/workflows/validate-rsis.yml +++ b/.github/workflows/validate-rsis.yml @@ -1,6 +1,7 @@ name: RSI Validator on: + merge_group: pull_request: paths: - '**.rsi/**' diff --git a/.github/workflows/validate_mapfiles.yml b/.github/workflows/validate_mapfiles.yml index fdaee6cc97..1258fe01d4 100644 --- a/.github/workflows/validate_mapfiles.yml +++ b/.github/workflows/validate_mapfiles.yml @@ -1,6 +1,7 @@ name: YAML schema validator on: push: + 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 2b996bd477..e55639a795 100644 --- a/.github/workflows/yaml-linter.yml +++ b/.github/workflows/yaml-linter.yml @@ -2,6 +2,7 @@ name: YAML Linter on: push: + merge_group: pull_request: types: [ opened, reopened, synchronize, ready_for_review ]