Merge branch 'master' into ktyagi/mktg

Author: ktyagiapphelix2u

.github/CODEOWNERS

@@ -21,7 +21,11 @@ openedx/core/djangoapps/user_api/                                   @openedx/com
 openedx/core/djangoapps/user_authn/                                 @openedx/committers-edx-platform-2u-infinity
 openedx/core/djangoapps/verified_track_content/                     @openedx/committers-edx-platform-2u-infinity
 openedx/features/course_experience/
-xmodule/
+# The Aximprovements team is working on extracting all built-in XBlocks
+# to the external repository (xblocks-contrib). They need to be notified
+# about any changes within xmodule to stay aligned with this effort.
+# Ticket: https://github.com/openedx/edx-platform/issues/34827
+xmodule/                                                            @farhan @irtazaakram @salman2013
 
 # Core Extensions
 lms/djangoapps/discussion/

.github/workflows/check-consistent-dependencies.yml

@@ -7,6 +7,7 @@ name: Consistent Python dependencies
 
 on:
   pull_request:
+  merge_group:
 
 defaults:
   run:
@@ -18,26 +19,31 @@ jobs:
     runs-on: ubuntu-24.04
 
     steps:
+      # Always checkout the code because we don't always have a PR url.
+      - uses: actions/checkout@v5
+
       # Only run remaining steps if there are changes to requirements/**
+      # We do this instead of using path based short-circuiting.
+      # see https://stackoverflow.com/questions/77996177/how-can-i-handle-a-required-check-that-isnt-always-triggered
+      # for some more details.
       - name: "Decide whether to short-circuit"
-        env:
-          GH_TOKEN: "${{ github.token }}"
-          PR_URL: "${{ github.event.pull_request.html_url }}"
         run: |
-          paths=$(gh pr diff "$PR_URL" --name-only)
-          echo $'Paths touched in PR:\n'"$paths"
+          if [[ "${{ github.event_name }}" == "pull_request" ]]; then
+            BASE_SHA="${{ github.event.pull_request.base.sha }}"
+          else
+            BASE_SHA="${{ github.event.merge_group.base_sha }}"
+          fi
+
+          # Fetch the base sha so we can compare to it. It's not checked out by
+          # default.
+          git fetch origin "$BASE_SHA"
 
           # The ^"? is because git may quote weird file paths
-          matched="$(echo "$paths" | grep -P '^"?((requirements/)|(scripts/.*?/requirements/))' || true)"
-          echo $'Relevant paths:\n'"$matched"
-          if [[ -n "$matched" ]]; then
-              echo "RELEVANT=true" >> "$GITHUB_ENV"
+          if git diff --name-only "$BASE_SHA" | grep -P '^"?((requirements/)|(scripts/.*?/requirements/))'; then
+            echo "RELEVANT=true" >> "$GITHUB_ENV"
           fi
 
-      - uses: actions/checkout@v5
-        if: ${{ env.RELEVANT == 'true' }}
-
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         if: ${{ env.RELEVANT == 'true' }}
         with:
           python-version: '3.11'

.github/workflows/check-for-tutorial-prs.yml

@@ -26,7 +26,7 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Comment PR
-        uses: thollander/actions-comment-pull-request@v2
+        uses: thollander/actions-comment-pull-request@v3
         with:
           message: |
             Thank you for your pull request! Congratulations on completing the Open edX tutorial! A team member will be by to take a look shortly.

.github/workflows/check_python_dependencies.yml

@@ -2,6 +2,7 @@ name: Check Python Dependencies
 
 on:
   pull_request:
+  merge_group:
 
 jobs:
   check_dependencies:
@@ -16,7 +17,7 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
 

.github/workflows/ci-static-analysis.yml

@@ -1,6 +1,8 @@
 name: Static analysis
 
-on: pull_request
+on:
+  pull_request:
+  merge_group:
 
 jobs:
   tests:
@@ -15,7 +17,7 @@ jobs:
     steps:
       - uses: actions/checkout@v5
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
 

.github/workflows/commitlint.yml

@@ -3,7 +3,8 @@
 name: Lint Commit Messages
 
 on:
-  - pull_request
+  pull_request:
+  merge_group:
 
 jobs:
   commitlint:

.github/workflows/compile-python-requirements.yml

@@ -24,7 +24,7 @@ jobs:
           ref: "${{ inputs.branch }}"
 
       - name: Set up Python environment
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "3.11"
 

.github/workflows/js-tests.yml

@@ -2,6 +2,7 @@ name: Javascript tests
 
 on:
   pull_request:
+  merge_group:
   push:
     branches:
       - master
@@ -23,7 +24,7 @@ jobs:
         run: git fetch --depth=1 origin master
 
       - name: Setup Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'npm'
@@ -43,7 +44,7 @@ jobs:
         run: sudo apt-get update && sudo apt-get install libxmlsec1-dev ubuntu-restricted-extras xvfb
 
       - name: Setup Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
 

.github/workflows/lint-imports.yml

@@ -2,6 +2,7 @@ name: Lint Python Imports
 
 on:
   pull_request:
+  merge_group:
   push:
     branches:
       - master
@@ -16,7 +17,7 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "3.11"
 

.github/workflows/lockfileversion-check.yml

@@ -7,6 +7,7 @@ on:
     branches:
       - master
   pull_request:
+  merge_group:
 
 jobs:
   version-check: