Merge branch 'release-ulmo' into kiram15/ENT-11570

Author: kiram15

.github/CODEOWNERS

@@ -21,11 +21,7 @@ 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/
-# 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
+xmodule/
 
 # Core Extensions
 lms/djangoapps/discussion/

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

@@ -19,31 +19,26 @@ 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: |
-          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"
+          paths=$(gh pr diff "$PR_URL" --name-only)
+          echo $'Paths touched in PR:\n'"$paths"
 
           # The ^"? is because git may quote weird file paths
-          if git diff --name-only "$BASE_SHA" | grep -P '^"?((requirements/)|(scripts/.*?/requirements/))'; then
-            echo "RELEVANT=true" >> "$GITHUB_ENV"
+          matched="$(echo "$paths" | grep -P '^"?((requirements/)|(scripts/.*?/requirements/))' || true)"
+          echo $'Relevant paths:\n'"$matched"
+          if [[ -n "$matched" ]]; then
+              echo "RELEVANT=true" >> "$GITHUB_ENV"
           fi
 
-      - uses: actions/setup-python@v6
+      - uses: actions/checkout@v5
+        if: ${{ env.RELEVANT == 'true' }}
+
+      - uses: actions/setup-python@v5
         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@v3
+        uses: thollander/actions-comment-pull-request@v2
         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

@@ -17,7 +17,7 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 

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

@@ -17,7 +17,7 @@ jobs:
     steps:
       - uses: actions/checkout@v5
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 

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

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

.github/workflows/js-tests.yml

@@ -24,7 +24,7 @@ jobs:
         run: git fetch --depth=1 origin master
 
       - name: Setup Node
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'npm'
@@ -44,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@v6
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 

.github/workflows/lint-imports.yml

@@ -17,7 +17,7 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
         with:
           python-version: "3.11"
 

.github/workflows/migrations-check.yml

@@ -74,7 +74,7 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Setup Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 

.github/workflows/pylint-checks.yml

@@ -38,7 +38,7 @@ jobs:
         run: sudo apt-get update && sudo apt-get install libxmlsec1-dev
 
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
         with:
           python-version: 3.11