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 abc51eb91b74..5b9b4eaed654 100644 --- a/.github/workflows/pylint-checks.yml +++ b/.github/workflows/pylint-checks.yml @@ -2,9 +2,10 @@ name: Pylint Checks on: pull_request: + merge_group: push: branches: - - master + - release-ulmo jobs: run-pylint: 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 462f0e06af0b..f7517914c6e1 100644 --- a/.github/workflows/verify-dunder-init.yml +++ b/.github/workflows/verify-dunder-init.yml @@ -2,6 +2,8 @@ name: Verify Dunder __init__.py Files on: pull_request: + merge_group: + push: branches: - release-ulmo