From c271a9b812baa5a6bf5d0166edde251874b717fc Mon Sep 17 00:00:00 2001 From: "John L. Singleton" Date: Wed, 8 Mar 2023 09:18:30 -0500 Subject: [PATCH 1/2] merge queues --- .github/workflows/code-scanning-pack-gen.yml | 1 + .github/workflows/codeql_unit_tests.yml | 1 + .github/workflows/extra-rule-validation.yml | 1 + .github/workflows/generate-html-docs.yml | 1 + .github/workflows/standard_library_upgrade_tests.yml | 1 + .github/workflows/tooling-unit-tests.yml | 1 + .github/workflows/validate-coding-standards.yml | 1 + .github/workflows/verify-standard-library-dependencies.yml | 1 + 8 files changed, 8 insertions(+) diff --git a/.github/workflows/code-scanning-pack-gen.yml b/.github/workflows/code-scanning-pack-gen.yml index ca03cb01a5..9cf2b3ebe8 100644 --- a/.github/workflows/code-scanning-pack-gen.yml +++ b/.github/workflows/code-scanning-pack-gen.yml @@ -1,6 +1,7 @@ name: Code Scanning Query Pack Generation on: + merge_group: pull_request: branches: - main diff --git a/.github/workflows/codeql_unit_tests.yml b/.github/workflows/codeql_unit_tests.yml index 4d33e933ce..053bea4985 100644 --- a/.github/workflows/codeql_unit_tests.yml +++ b/.github/workflows/codeql_unit_tests.yml @@ -1,6 +1,7 @@ name: CodeQL Unit Testing on: + merge_group: push: branches: - main diff --git a/.github/workflows/extra-rule-validation.yml b/.github/workflows/extra-rule-validation.yml index 218d0d171a..1b2c1a3aef 100644 --- a/.github/workflows/extra-rule-validation.yml +++ b/.github/workflows/extra-rule-validation.yml @@ -1,6 +1,7 @@ name: ⚙️ Extra Rule Validation on: + merge_group: push: branches: - main diff --git a/.github/workflows/generate-html-docs.yml b/.github/workflows/generate-html-docs.yml index 1093715ad4..bb12ba8a2b 100644 --- a/.github/workflows/generate-html-docs.yml +++ b/.github/workflows/generate-html-docs.yml @@ -1,6 +1,7 @@ name: Generate HTML documentation on: + merge_group: push: branches: - main diff --git a/.github/workflows/standard_library_upgrade_tests.yml b/.github/workflows/standard_library_upgrade_tests.yml index aac2fd1e0e..df88861b03 100644 --- a/.github/workflows/standard_library_upgrade_tests.yml +++ b/.github/workflows/standard_library_upgrade_tests.yml @@ -2,6 +2,7 @@ name: CodeQL Standard Library Upgrade tests # Run this workflow every time the "supported_codeql_configs.json" file is changed on: + merge_group: pull_request: branches: - main diff --git a/.github/workflows/tooling-unit-tests.yml b/.github/workflows/tooling-unit-tests.yml index d2ed099a2e..840e7c5b97 100644 --- a/.github/workflows/tooling-unit-tests.yml +++ b/.github/workflows/tooling-unit-tests.yml @@ -1,6 +1,7 @@ name: 🧰 Tooling unit tests on: + merge_group: push: branches: - main diff --git a/.github/workflows/validate-coding-standards.yml b/.github/workflows/validate-coding-standards.yml index a57634dfc0..aad7a435b1 100644 --- a/.github/workflows/validate-coding-standards.yml +++ b/.github/workflows/validate-coding-standards.yml @@ -1,6 +1,7 @@ name: Validating Coding Standards on: + merge_group: push: branches: - main diff --git a/.github/workflows/verify-standard-library-dependencies.yml b/.github/workflows/verify-standard-library-dependencies.yml index 91f4a5075b..ab78744e4e 100644 --- a/.github/workflows/verify-standard-library-dependencies.yml +++ b/.github/workflows/verify-standard-library-dependencies.yml @@ -2,6 +2,7 @@ name: Verify Standard Library Dependencies # Run this workflow every time the "supported_codeql_configs.json" file or a "qlpack.yml" file is changed on: + merge_group: pull_request: branches: - main From cc44bd742677c72a25aac795ec3020645126efeb Mon Sep 17 00:00:00 2001 From: "John L. Singleton" Date: Wed, 8 Mar 2023 11:16:47 -0500 Subject: [PATCH 2/2] this shouldn't run --- .github/workflows/standard_library_upgrade_tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/standard_library_upgrade_tests.yml b/.github/workflows/standard_library_upgrade_tests.yml index df88861b03..aac2fd1e0e 100644 --- a/.github/workflows/standard_library_upgrade_tests.yml +++ b/.github/workflows/standard_library_upgrade_tests.yml @@ -2,7 +2,6 @@ name: CodeQL Standard Library Upgrade tests # Run this workflow every time the "supported_codeql_configs.json" file is changed on: - merge_group: pull_request: branches: - main