From 272b1669c2c1c70a1b532dfce71ad03ca16b1311 Mon Sep 17 00:00:00 2001 From: Braden MacDonald Date: Thu, 9 Oct 2025 14:31:31 -0700 Subject: [PATCH] build: enable CI checks in merge queues / merge groups on GitHub --- .github/workflows/check-consistent-dependencies.yml | 1 + .github/workflows/check_python_dependencies.yml | 1 + .github/workflows/ci-static-analysis.yml | 4 +++- .github/workflows/commitlint.yml | 3 ++- .github/workflows/js-tests.yml | 1 + .github/workflows/lint-imports.yml | 1 + .github/workflows/lockfileversion-check.yml | 1 + .github/workflows/migrations-check.yml | 1 + .github/workflows/pylint-checks.yml | 1 + .github/workflows/quality-checks.yml | 1 + .github/workflows/semgrep.yml | 1 + .github/workflows/shellcheck.yml | 1 + .github/workflows/static-assets-check.yml | 1 + .github/workflows/unit-tests.yml | 1 + .github/workflows/units-test-scripts-structures-pruning.yml | 1 + .github/workflows/units-test-scripts-user-retirement.yml | 1 + .github/workflows/verify-dunder-init.yml | 1 + 17 files changed, 20 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check-consistent-dependencies.yml b/.github/workflows/check-consistent-dependencies.yml index c3f35d92a0..87706e5a09 100644 --- a/.github/workflows/check-consistent-dependencies.yml +++ b/.github/workflows/check-consistent-dependencies.yml @@ -7,6 +7,7 @@ name: Consistent Python dependencies on: pull_request: + merge_group: defaults: run: diff --git a/.github/workflows/check_python_dependencies.yml b/.github/workflows/check_python_dependencies.yml index 7b93a545cd..64da3b985f 100644 --- a/.github/workflows/check_python_dependencies.yml +++ b/.github/workflows/check_python_dependencies.yml @@ -2,6 +2,7 @@ name: Check Python Dependencies on: pull_request: + merge_group: jobs: check_dependencies: diff --git a/.github/workflows/ci-static-analysis.yml b/.github/workflows/ci-static-analysis.yml index d2513ba210..16af7aa696 100644 --- a/.github/workflows/ci-static-analysis.yml +++ b/.github/workflows/ci-static-analysis.yml @@ -1,6 +1,8 @@ name: Static analysis -on: pull_request +on: + pull_request: + merge_group: jobs: tests: diff --git a/.github/workflows/commitlint.yml b/.github/workflows/commitlint.yml index fec11d6c25..03b0c6c133 100644 --- a/.github/workflows/commitlint.yml +++ b/.github/workflows/commitlint.yml @@ -3,7 +3,8 @@ name: Lint Commit Messages on: - - pull_request + pull_request: + merge_group: jobs: commitlint: diff --git a/.github/workflows/js-tests.yml b/.github/workflows/js-tests.yml index 94a1368e96..266e752783 100644 --- a/.github/workflows/js-tests.yml +++ b/.github/workflows/js-tests.yml @@ -2,6 +2,7 @@ name: Javascript tests on: pull_request: + merge_group: push: branches: - master diff --git a/.github/workflows/lint-imports.yml b/.github/workflows/lint-imports.yml index baf914298b..a3d2129dd2 100644 --- a/.github/workflows/lint-imports.yml +++ b/.github/workflows/lint-imports.yml @@ -2,6 +2,7 @@ name: Lint Python Imports on: pull_request: + merge_group: push: branches: - master diff --git a/.github/workflows/lockfileversion-check.yml b/.github/workflows/lockfileversion-check.yml index 736f1f98de..1ebd22b9ad 100644 --- a/.github/workflows/lockfileversion-check.yml +++ b/.github/workflows/lockfileversion-check.yml @@ -7,6 +7,7 @@ on: branches: - master pull_request: + merge_group: jobs: version-check: diff --git a/.github/workflows/migrations-check.yml b/.github/workflows/migrations-check.yml index cd4d09589c..966a6635f9 100644 --- a/.github/workflows/migrations-check.yml +++ b/.github/workflows/migrations-check.yml @@ -3,6 +3,7 @@ name: Check Django Migrations on: workflow_dispatch: pull_request: + merge_group: push: branches: - master diff --git a/.github/workflows/pylint-checks.yml b/.github/workflows/pylint-checks.yml index abc51eb91b..124745cc5e 100644 --- a/.github/workflows/pylint-checks.yml +++ b/.github/workflows/pylint-checks.yml @@ -2,6 +2,7 @@ name: Pylint Checks on: pull_request: + merge_group: push: branches: - master diff --git a/.github/workflows/quality-checks.yml b/.github/workflows/quality-checks.yml index 3f4cbeeb4d..32c5768523 100644 --- a/.github/workflows/quality-checks.yml +++ b/.github/workflows/quality-checks.yml @@ -2,6 +2,7 @@ name: Quality checks on: pull_request: + merge_group: push: branches: - master diff --git a/.github/workflows/semgrep.yml b/.github/workflows/semgrep.yml index 520cd23a67..8360ae4650 100644 --- a/.github/workflows/semgrep.yml +++ b/.github/workflows/semgrep.yml @@ -7,6 +7,7 @@ name: Semgrep code quality on: pull_request: + merge_group: push: branches: - master diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml index 2e5b04bcc2..ad3d6c3a1e 100644 --- a/.github/workflows/shellcheck.yml +++ b/.github/workflows/shellcheck.yml @@ -7,6 +7,7 @@ name: ShellCheck on: pull_request: + merge_group: push: branches: - master diff --git a/.github/workflows/static-assets-check.yml b/.github/workflows/static-assets-check.yml index 43cb597c16..4c67916431 100644 --- a/.github/workflows/static-assets-check.yml +++ b/.github/workflows/static-assets-check.yml @@ -2,6 +2,7 @@ name: static assets check for lms and cms on: pull_request: + merge_group: push: branches: - master diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 05e5f47d1a..34a51c5adb 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -2,6 +2,7 @@ name: unit-tests on: pull_request: + merge_group: push: branches: - master diff --git a/.github/workflows/units-test-scripts-structures-pruning.yml b/.github/workflows/units-test-scripts-structures-pruning.yml index 14a01b5923..d6575abacb 100644 --- a/.github/workflows/units-test-scripts-structures-pruning.yml +++ b/.github/workflows/units-test-scripts-structures-pruning.yml @@ -2,6 +2,7 @@ name: units-test-scripts-common on: pull_request: + merge_group: push: branches: - master diff --git a/.github/workflows/units-test-scripts-user-retirement.yml b/.github/workflows/units-test-scripts-user-retirement.yml index 889c43a64a..d4051de6bd 100644 --- a/.github/workflows/units-test-scripts-user-retirement.yml +++ b/.github/workflows/units-test-scripts-user-retirement.yml @@ -2,6 +2,7 @@ name: units-test-scripts-user-retirement on: pull_request: + merge_group: push: branches: - master diff --git a/.github/workflows/verify-dunder-init.yml b/.github/workflows/verify-dunder-init.yml index c3248def2f..2a80d40ce5 100644 --- a/.github/workflows/verify-dunder-init.yml +++ b/.github/workflows/verify-dunder-init.yml @@ -4,6 +4,7 @@ on: pull_request: branches: - master + merge_group: jobs: verify_dunder_init: