From 99891096ca64842624b71b36c403ad6d3b2eb0d5 Mon Sep 17 00:00:00 2001 From: Akanshu Aich Date: Wed, 11 Mar 2026 13:43:18 +0000 Subject: [PATCH 1/3] fix: update release-ulmo branch triggers for pylint and dunder init workflows --- .github/workflows/pylint-checks.yml | 2 +- .github/workflows/verify-dunder-init.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pylint-checks.yml b/.github/workflows/pylint-checks.yml index abc51eb91b74..694a3eedda24 100644 --- a/.github/workflows/pylint-checks.yml +++ b/.github/workflows/pylint-checks.yml @@ -4,7 +4,7 @@ on: pull_request: push: branches: - - master + - release-ulmo jobs: run-pylint: diff --git a/.github/workflows/verify-dunder-init.yml b/.github/workflows/verify-dunder-init.yml index 462f0e06af0b..324f0926cf33 100644 --- a/.github/workflows/verify-dunder-init.yml +++ b/.github/workflows/verify-dunder-init.yml @@ -2,6 +2,7 @@ name: Verify Dunder __init__.py Files on: pull_request: + push: branches: - release-ulmo From a9e9d9b3bdcba7fdd084b9911cb86c5f0f4d738a Mon Sep 17 00:00:00 2001 From: Braden MacDonald Date: Thu, 9 Oct 2025 14:31:31 -0700 Subject: [PATCH 2/3] fix: 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 c3f35d92a03b..87706e5a09db 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 7b93a545cd4b..64da3b985fef 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 d2513ba2104f..16af7aa69609 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 fec11d6c259b..03b0c6c1336e 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 972435a820e3..5379dfaf1c66 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: - release-ulmo diff --git a/.github/workflows/lint-imports.yml b/.github/workflows/lint-imports.yml index 17cc4ea0a935..1eefafe8782e 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: - release-ulmo diff --git a/.github/workflows/lockfileversion-check.yml b/.github/workflows/lockfileversion-check.yml index ed0b7f97de6d..22baf1d80ab0 100644 --- a/.github/workflows/lockfileversion-check.yml +++ b/.github/workflows/lockfileversion-check.yml @@ -7,6 +7,7 @@ on: branches: - release-ulmo pull_request: + merge_group: jobs: version-check: diff --git a/.github/workflows/migrations-check.yml b/.github/workflows/migrations-check.yml index 686d8d9086b0..d19c65a71065 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: - release-ulmo diff --git a/.github/workflows/pylint-checks.yml b/.github/workflows/pylint-checks.yml index 694a3eedda24..5b9b4eaed654 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: - release-ulmo diff --git a/.github/workflows/quality-checks.yml b/.github/workflows/quality-checks.yml index ee67e3903569..0a0f0fc94b11 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: - release-ulmo diff --git a/.github/workflows/semgrep.yml b/.github/workflows/semgrep.yml index d9d32ab9d36d..8239d7a04cd8 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: - release-ulmo diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml index a8df63a20d57..93bcb2378af9 100644 --- a/.github/workflows/shellcheck.yml +++ b/.github/workflows/shellcheck.yml @@ -7,6 +7,7 @@ name: ShellCheck on: pull_request: + merge_group: push: branches: - release-ulmo diff --git a/.github/workflows/static-assets-check.yml b/.github/workflows/static-assets-check.yml index 3a0afa76deb7..5eb569c08345 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: - release-ulmo diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 036d411fa1a0..b0b2d1326c21 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: - release-ulmo diff --git a/.github/workflows/units-test-scripts-structures-pruning.yml b/.github/workflows/units-test-scripts-structures-pruning.yml index ef408cfe66ec..c4d2d4e8836b 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: - release-ulmo diff --git a/.github/workflows/units-test-scripts-user-retirement.yml b/.github/workflows/units-test-scripts-user-retirement.yml index b43bbf46b0d4..70289bea3e52 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: - release-ulmo diff --git a/.github/workflows/verify-dunder-init.yml b/.github/workflows/verify-dunder-init.yml index 324f0926cf33..58c0cbc7d850 100644 --- a/.github/workflows/verify-dunder-init.yml +++ b/.github/workflows/verify-dunder-init.yml @@ -5,6 +5,7 @@ on: push: branches: - release-ulmo + merge_group: jobs: verify_dunder_init: From 2c6d31320166b65e63a406a3f5f22ebc1fb00fb2 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Mon, 20 Oct 2025 12:06:12 -0400 Subject: [PATCH 3/3] fix: Fix workflow triggers for the Dunder init check. This check was previously only running on PRs to master, which makes it annoying to stack PRs and have all the checks run. Update it so that the check runs on all PRs and on pushes to master. --- .github/workflows/verify-dunder-init.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/verify-dunder-init.yml b/.github/workflows/verify-dunder-init.yml index 58c0cbc7d850..f7517914c6e1 100644 --- a/.github/workflows/verify-dunder-init.yml +++ b/.github/workflows/verify-dunder-init.yml @@ -2,10 +2,10 @@ name: Verify Dunder __init__.py Files on: pull_request: + merge_group: push: branches: - release-ulmo - merge_group: jobs: verify_dunder_init: