Merge branch 'master' into fix-FB-share

.eslintrc.json

@@ -26,6 +26,7 @@
   "rules": {
     "func-names": "off",
     "indent": ["error", 4],
+    "react/jsx-indent": ["error", 4],
     "new-cap": "off",
     "no-else-return": "off",
     "no-shadow": "error",
@@ -40,23 +41,16 @@
     "camelcase": "off",
     "comma-dangle": "off",
     "consistent-return": "off",
-    "curly": "off",
     "eqeqeq": "off",
     "function-call-argument-newline": "off",
     "function-paren-newline": "off",
-    "implicit-arrow-linebreak": "off",
     "import/extensions": "off",
     "import/no-amd": "off",
     "import/no-dynamic-require": "off",
     "import/no-unresolved": "off",
-    "linebreak-style": "off",
-    "lines-around-directive": "off",
     "max-len": "off",
-    "newline-per-chained-call": "off",
     "no-console": "off",
     "no-lonely-if": "off",
-    "no-multi-spaces": "off",
-    "no-multiple-empty-lines": "off",
     "no-param-reassign": "off",
     "no-proto": "off",
     "no-prototype-builtins": "off",
@@ -70,20 +64,14 @@
     "no-use-before-define": "off",
     "no-useless-escape": "off",
     "no-var": "off",
-    "object-curly-newline": "off",
     "object-shorthand": "off",
-    "operator-linebreak": "off",
     "prefer-arrow-callback": "off",
     "prefer-destructuring": "off",
     "prefer-rest-params": "off",
     "prefer-template": "off",
-    "quotes": "off",
     "radix": "off",
-    "react/jsx-indent": "off",
-    "react/jsx-indent-props": "off",
-    "react/jsx-wrap-multilines": "off",
+    "react/jsx-indent-props": ["error", 4],
     "react/prop-types": "off",
-    "semi": "off",
     "vars-on-top": "off"
   }
 }

.github/CODEOWNERS

@@ -46,3 +46,7 @@ openedx/features/discounts/
 # Ping tCRIL On-call if someone uses the QuickStart
 # https://docs.openedx.org/en/latest/developers/quickstarts/first_openedx_pr.html
 lms/templates/dashboard.html               @openedx/tcril-oncall
+
+# Ensure minimal.yml stays minimal, this could be a team in the future
+# but it's just me for now, others can sign up if they care as well.
+lms/envs/minimal.yml                                            @feanil

.github/dependabot.yml

@@ -0,0 +1,9 @@
+version: 2
+updates:
+    # Adding new check for github-actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+        interval: "weekly"
+    reviewers:
+      - "openedx/arbi-bom"

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

@@ -26,7 +26,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Comment PR
-        uses: thollander/actions-comment-pull-request@v1
+        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/ci-static-analysis.yml

@@ -14,7 +14,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -30,7 +30,7 @@ jobs:
 
       - name: Cache pip dependencies
         id: cache-dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.pip-cache-dir.outputs.dir }}
           key: ${{ runner.os }}-pip-${{ hashFiles('requirements/edx/development.txt') }}

.github/workflows/docs-build-check.yml

@@ -18,7 +18,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -34,7 +34,7 @@ jobs:
 
       - name: Cache pip dependencies
         id: cache-dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.pip-cache-dir.outputs.dir }}
           key: ${{ runner.os }}-pip-${{ hashFiles('requirements/edx/development.txt') }}

.github/workflows/js-tests.yml

@@ -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@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
 
@@ -55,7 +55,7 @@ jobs:
 
     - name: Cache pip dependencies
       id: cache-dependencies
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ${{ steps.pip-cache-dir.outputs.dir }}
         key: ${{ runner.os }}-pip-${{ hashFiles('requirements/edx/base.txt') }}

.github/workflows/lint-imports.yml

@@ -17,7 +17,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: '3.8'
 
@@ -33,7 +33,7 @@ jobs:
 
       - name: Cache pip dependencies
         id: cache-dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.pip-cache-dir.outputs.dir }}
           key: ${{ runner.os }}-pip-${{ hashFiles('requirements/edx/development.txt') }}

.github/workflows/migrations-check-mysql8.yml

@@ -21,7 +21,7 @@ jobs:
       uses: actions/checkout@v2
 
     - name: Setup Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
 
@@ -37,7 +37,7 @@ jobs:
 
     - name: Cache pip dependencies
       id: cache-dependencies
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ${{ steps.pip-cache-dir.outputs.dir }}
         key: ${{ runner.os }}-pip-${{ hashFiles('requirements/edx/development.txt') }}

.github/workflows/migrations-check.yml

@@ -21,7 +21,7 @@ jobs:
       uses: actions/checkout@v2
 
     - name: Setup Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
 
@@ -37,7 +37,7 @@ jobs:
 
     - name: Cache pip dependencies
       id: cache-dependencies
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ${{ steps.pip-cache-dir.outputs.dir }}
         key: ${{ runner.os }}-pip-${{ hashFiles('requirements/edx/development.txt') }}

.github/workflows/pylint-checks.yml

@@ -37,7 +37,7 @@ jobs:
         run: sudo apt-get update && sudo apt-get install libxmlsec1-dev
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: 3.8
 
@@ -48,7 +48,7 @@ jobs:
 
       - name: Cache pip dependencies
         id: cache-dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.pip-cache-dir.outputs.dir }}
           key: ${{ runner.os }}-pip-${{ hashFiles('requirements/edx/development.txt') }}

.github/workflows/quality-checks.yml

@@ -30,7 +30,7 @@ jobs:
       run: sudo apt-get update && sudo apt-get install libxmlsec1-dev
 
     - name: Setup Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
 
@@ -49,7 +49,7 @@ jobs:
 
     - name: Cache pip dependencies
       id: cache-dependencies
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ${{ steps.pip-cache-dir.outputs.dir }}
         key: ${{ runner.os }}-pip-${{ hashFiles('requirements/edx/testing.txt') }}

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

@@ -22,7 +22,7 @@ jobs:
       uses: actions/checkout@v2
 
     - name: Setup Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
 
@@ -46,7 +46,7 @@ jobs:
 
     - name: Cache pip dependencies
       id: cache-dependencies
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ${{ steps.pip-cache-dir.outputs.dir }}
         key: ${{ runner.os }}-pip-${{ hashFiles('requirements/edx/development.txt') }}

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

@@ -126,6 +126,7 @@
       "openedx/core/djangoapps/lang_pref/",
       "openedx/core/djangoapps/models/",
       "openedx/core/djangoapps/monkey_patch/",
+      "openedx/core/djangoapps/notifications/",
       "openedx/core/djangoapps/oauth_dispatch/",
       "openedx/core/djangoapps/olx_rest_api/",
       "openedx/core/djangoapps/password_policy/",

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

@@ -17,23 +17,24 @@ jobs:
         python-version: [ '3.8' ]
         django-version:
           - "pinned"
-        shard_name: [
-            "lms-1",
-            "lms-2",
-            "lms-3",
-            "lms-4",
-            "lms-5",
-            "lms-6",
-            "openedx-1",
-            "openedx-2",
-            "openedx-3",
-            "openedx-4",
-            "cms-1",
-            "cms-2",
-            "common-1",
-            "common-2",
-            "common-3",
-        ]
+        # When updating the shards, remember to make the same changes in
+        # .github/workflows/unit-tests.yml
+        shard_name:
+          - "lms-1"
+          - "lms-2"
+          - "lms-3"
+          - "lms-4"
+          - "lms-5"
+          - "lms-6"
+          - "openedx-1"
+          - "openedx-2"
+          - "openedx-3"
+          - "openedx-4"
+          - "cms-1"
+          - "cms-2"
+          - "common-1"
+          - "common-2"
+          - "xmodule-1"
     name: gh-hosted-python-${{ matrix.python-version }},django-${{ matrix.django-version }},${{ matrix.shard_name }}
     steps:
       - uses: actions/checkout@v2
@@ -47,7 +48,7 @@ jobs:
           mongodb-version: 4.4
 
       - name: Setup Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -58,7 +59,7 @@ jobs:
 
       - name: Cache pip dependencies
         id: cache-dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.pip-cache-dir.outputs.dir }}
           key: ${{ runner.os }}-pip-${{ hashFiles('requirements/edx/testing.txt') }}
@@ -92,7 +93,7 @@ jobs:
         run: sudo apt-get update && sudo apt-get install libxmlsec1-dev
 
       - name: Setup Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -103,7 +104,7 @@ jobs:
 
       - name: Cache pip dependencies
         id: cache-dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.pip-cache-dir.outputs.dir }}
           key: ${{ runner.os }}-pip-${{ hashFiles('requirements/edx/testing.txt') }}

.github/workflows/unit-tests.yml

@@ -18,6 +18,8 @@ jobs:
         django-version:
           - "pinned"
           #- "4.0"
+        # When updating the shards, remember to make the same changes in
+        # .github/workflows/unit-tests-gh-hosted.yml
         shard_name:
           - "lms-1"
           - "lms-2"
@@ -80,7 +82,7 @@ jobs:
   # https://github.com/orgs/community/discussions/33579
   success:
     name: Tests successful
-    if: always()
+    if: (github.repository == 'edx/edx-platform-private') || (github.repository == 'openedx/edx-platform' && (startsWith(github.base_ref, 'open-release') == false))
     needs:
       - run-tests
     runs-on: ubuntu-latest