Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
salman2013
2023-10-23 12:05:25 +05:00
parent 2a4ce5fa48 7900711684
commit 9452cef97d
391 changed files with 6442 additions and 7220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/js-tests.yml vendored
View File

@@ -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: |

2
.github/workflows/migrations-check.yml vendored
View File

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

11
.github/workflows/publish-ci-docker-image.yml vendored
View File

@@ -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 }}

2
.github/workflows/pylint-checks.yml vendored
View File

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

4
.github/workflows/quality-checks.yml vendored
View File

@@ -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: |

2
.github/workflows/static-assets-check.yml vendored
View File

@@ -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 }}

21
.github/workflows/unit-test-shards.json vendored
View File

@@ -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/"
]
}
}

15
.github/workflows/unit-tests-gh-hosted.yml vendored
View File

@@ -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

19
.github/workflows/unit-tests.yml vendored
View File

@@ -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/alls-green@v1.2.1
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