Merge branch 'master' into rg/feat/FC0031/extended_blocks_in_course_view

.github/actions/unit-tests/action.yml

@@ -27,7 +27,7 @@ runs:
 
     - name: save pytest warnings json file
       if: success()
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: pytest-warnings-json
         path: |

.github/pull_request_template.md

@@ -1,10 +1,13 @@
 <!--
 
-🌴🌴
-🌴🌴🌴🌴         🌴 Note: Palm is in support. Fixes you make on master may still be needed on Palm.
-    🌴🌴🌴🌴     If so, make another pull request against the open-release/palm.master branch,
-🌴🌴🌴🌴         or ask in the #wg-build-test-release Slack channel if you have any questions or need help.
-🌴🌴
+🌳🌳
+🌳🌳🌳🌳         🌳 Note: Quince is in support. Fixes you make on master may still be needed on Quince.
+    🌳🌳🌳🌳     If so, make another pull request against the open-release/quince.master branch,
+🌳🌳🌳🌳         or ask in the #wg-build-test-release Slack channel if you have any questions or need help.
+🌳🌳
+
+🌴🌴🌴🌴🌴🌴     🌴 Note: the Palm release is still supported.
+                Please consider whether your change should be applied to Palm as well.
 
 Please give your pull request a short but descriptive title.
 Use conventional commits to separate and summarize commits logically:

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

@@ -7,13 +7,6 @@ name: Consistent Python dependencies
 
 on:
   pull_request:
-    paths:
-      - 'requirements/**'
-  push:
-    branches:
-      - master
-    paths:
-      - 'requirements/**'
 
 defaults:
   run:
@@ -25,16 +18,37 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
+      # Only run remaining steps if there are changes to requirements/**
+      - 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"
+
+          # The ^"? is because git may quote weird file paths
+          matched="$(echo "$paths" | grep -P '^"?requirements/' || true)"
+          echo $'Relevant paths:\n'"$matched"
+          if [[ -n "$matched" ]]; then
+              echo "RELEVANT=true" >> "$GITHUB_ENV"
+          fi
+
       - uses: actions/checkout@v3
+        if: ${{ env.RELEVANT == 'true' }}
 
       - uses: actions/setup-python@v4
+        if: ${{ env.RELEVANT == 'true' }}
         with:
           python-version: '3.8'
 
-      - run: |
+      - name: "Recompile requirements"
+        if: ${{ env.RELEVANT == 'true' }}
+        run: |
           make compile-requirements
 
       - name: Fail if compiling requirements caused changes
+        if: ${{ env.RELEVANT == 'true' }}
         run: |
           SUMMARY_HELP=$(cat <<'EOMARKDOWN'
           # Inconsistent Python dependencies

.github/workflows/docker-compose.yml.mysqldbdump

@@ -2,7 +2,7 @@ version: '3'
 services:
   mysql:
     image: mysql:5.7
-    container_name: edx.devstack.mysql57
+    container_name: edx.devstack.mysql80
     ports:
       - '3306:3306'
     environment:

.github/workflows/js-tests.yml

@@ -23,7 +23,7 @@ jobs:
       run: git fetch --depth=1 origin master
 
     - name: Setup Node
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
 
@@ -73,7 +73,7 @@ jobs:
         xvfb-run --auto-servernum ./scripts/all-tests.sh
 
     - name: Save Job Artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: Build-Artifacts
         path: |

.github/workflows/migrations-check.yml

@@ -133,6 +133,6 @@ jobs:
     steps:
       - name: Decide whether the needed jobs succeeded or failed
         # uses: re-actors/[email protected]
-        uses: re-actors/alls-green@13b4244b312e8a314951e03958a2f91519a6a3c9
+        uses: re-actors/alls-green@05ac9388f0aebcb5727afa17fcccfecd6f8ec5fe
         with:
           jobs: ${{ toJSON(needs) }}

.github/workflows/publish-ci-docker-image.yml

@@ -13,8 +13,17 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
+      # This has to happen after checkout in order for gh to work.
+      - name: "Cancel scheduled job on forks"
+        if: github.repository != 'openedx/edx-platform' && github.event_name == 'schedule'
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+        run: |
+          gh run cancel "${{ github.run_id }}"
+          gh run watch "${{ github.run_id }}"
+
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v3
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-access-key-id: ${{ secrets.TOOLS_EDX_ECR_USER_AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.TOOLS_EDX_ECR_USER_AWS_SECRET_ACCESS_KEY }}

.github/workflows/pylint-checks.yml

@@ -79,6 +79,6 @@ jobs:
     steps:
       - name: Decide whether the needed jobs succeeded or failed
         # uses: re-actors/[email protected]
-        uses: re-actors/alls-green@13b4244b312e8a314951e03958a2f91519a6a3c9
+        uses: re-actors/alls-green@05ac9388f0aebcb5727afa17fcccfecd6f8ec5fe
         with:
           jobs: ${{ toJSON(needs) }}

.github/workflows/quality-checks.yml

@@ -35,7 +35,7 @@ jobs:
         python-version: ${{ matrix.python-version }}
 
     - name: Setup Node
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
 
@@ -73,7 +73,7 @@ jobs:
 
     - name: Save Job Artifacts
       if: always()
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: Build-Artifacts
         path: |

.github/workflows/static-assets-check.yml

@@ -32,7 +32,7 @@ jobs:
         sudo apt-get install libxmlsec1-dev pkg-config
 
     - name: Setup Node
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
 

.github/workflows/unit-test-shards.json

@@ -2,7 +2,6 @@
   "lms-1": {
     "settings": "lms.envs.test",
     "paths": [
-      "lms/djangoapps/badges/",
       "lms/djangoapps/branding/",
       "lms/djangoapps/bulk_email/",
       "lms/djangoapps/bulk_enroll/",
@@ -78,7 +77,7 @@
       "lms/tests.py"
     ]
   },
-  "openedx-1": {
+  "openedx-1-with-lms": {
     "settings": "lms.envs.test",
     "paths": [
       "openedx/core/djangoapps/ace_common/",
@@ -116,7 +115,7 @@
       "openedx/core/djangoapps/external_user_ids/"
     ]
   },
-  "openedx-2": {
+  "openedx-2-with-lms": {
     "settings": "lms.envs.test",
     "paths": [
       "openedx/core/djangoapps/geoinfo/",
@@ -159,7 +158,7 @@
       "openedx/tests/"
     ]
   },
-  "openedx-3": {
+  "openedx-1-with-cms": {
     "settings": "cms.envs.test",
     "paths": [
       "openedx/core/djangoapps/ace_common/",
@@ -197,7 +196,7 @@
       "openedx/core/djangoapps/external_user_ids/"
     ]
   },
-  "openedx-4": {
+  "openedx-2-with-cms": {
     "settings": "cms.envs.test",
     "paths": [
       "openedx/core/djangoapps/content_tagging/",
@@ -258,22 +257,28 @@
       "cms/djangoapps/contentstore/"
     ]
   },
-  "common-1": {
+  "common-with-lms": {
     "settings": "lms.envs.test",
     "paths": [
       "common/djangoapps/"
     ]
   },
-  "common-2": {
+  "common-with-cms": {
     "settings": "cms.envs.test",
     "paths": [
       "common/djangoapps/"
     ]
   },
-  "xmodule-1": {
+  "xmodule-with-lms": {
     "settings": "lms.envs.test",
     "paths": [
       "xmodule/"
     ]
+  },
+  "xmodule-with-cms": {
+    "settings": "cms.envs.test",
+    "paths": [
+      "xmodule/"
+    ]
   }
 }

.github/workflows/unit-tests-gh-hosted.yml

@@ -26,15 +26,16 @@ jobs:
           - "lms-4"
           - "lms-5"
           - "lms-6"
-          - "openedx-1"
-          - "openedx-2"
-          - "openedx-3"
-          - "openedx-4"
+          - "openedx-1-with-lms"
+          - "openedx-2-with-lms"
+          - "openedx-1-with-cms"
+          - "openedx-2-with-cms"
           - "cms-1"
           - "cms-2"
-          - "common-1"
-          - "common-2"
-          - "xmodule-1"
+          - "common-with-lms"
+          - "common-with-cms"
+          - "xmodule-with-lms"
+          - "xmodule-with-cms"
     name: gh-hosted-python-${{ matrix.python-version }},django-${{ matrix.django-version }},${{ matrix.shard_name }}
     steps:
       - uses: actions/checkout@v2

.github/workflows/unit-tests.yml

@@ -27,15 +27,16 @@ jobs:
           - "lms-4"
           - "lms-5"
           - "lms-6"
-          - "openedx-1"
-          - "openedx-2"
-          - "openedx-3"
-          - "openedx-4"
+          - "openedx-1-with-lms"
+          - "openedx-2-with-lms"
+          - "openedx-1-with-cms"
+          - "openedx-2-with-cms"
           - "cms-1"
           - "cms-2"
-          - "common-1"
-          - "common-2"
-          - "xmodule-1"
+          - "common-with-lms"
+          - "common-with-cms"
+          - "xmodule-with-lms"
+          - "xmodule-with-cms"
     # We expect Django 4.0 to fail, so don't stop when it fails.
     continue-on-error: ${{ matrix.django-version == '4.0' }}
 
@@ -89,7 +90,7 @@ jobs:
     steps:
       - name: Decide whether the needed jobs succeeded or failed
         # uses: re-actors/[email protected]
-        uses: re-actors/alls-green@13b4244b312e8a314951e03958a2f91519a6a3c9
+        uses: re-actors/alls-green@05ac9388f0aebcb5727afa17fcccfecd6f8ec5fe
         with:
           jobs: ${{ toJSON(needs) }}
 
@@ -101,7 +102,7 @@ jobs:
         run: sudo chown runner:runner -R .*
       - uses: actions/checkout@v3
       - name: collect pytest warnings files
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: pytest-warnings-json
           path: test_root/log

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

@@ -10,7 +10,10 @@ on:
          required: true
          default: 'master'
 jobs:
-   call-upgrade-python-requirements-workflow:
+  call-upgrade-python-requirements-workflow:
+    # Don't run the weekly upgrade job on forks -- it will send a weekly failure email.
+    if: github.repository == 'openedx/edx-platform' || github.event_name != 'schedule'
+    uses: openedx/.github/.github/workflows/upgrade-python-requirements.yml@master
     with:
        branch: ${{ github.event.inputs.branch }}
        team_reviewers: "arbi-bom"
@@ -21,5 +24,4 @@ jobs:
        requirements_bot_github_email: ${{ secrets.REQUIREMENTS_BOT_GITHUB_EMAIL }}
        edx_smtp_username: ${{ secrets.EDX_SMTP_USERNAME }}
        edx_smtp_password: ${{ secrets.EDX_SMTP_PASSWORD }}
-    uses: openedx/.github/.github/workflows/upgrade-python-requirements.yml@master
 

.gitignore

@@ -136,6 +136,7 @@ build
 \#*\#
 .env/
 openedx/core/djangoapps/django_comment_common/comment_client/python
+openedx/core/djangoapps/cache_toolbox/__pycache__
 autodeploy.properties
 .ws_migrations_complete
 dist