diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index da6dc92a4..a06ae59b9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,8 +10,8 @@ jobs: - 3.11 edx_branch: - master - - open-release/quince.master - open-release/redwood.master + - open-release/sumac.master # Add more branches as needed steps: @@ -31,13 +31,13 @@ jobs: - name: Install tutor run: | - if [[ "${{ matrix.edx_branch }}" == "open-release/quince.master" ]]; then - pip install tutor==17.0.6 + if [[ "${{ matrix.edx_branch }}" == "open-release/redwood.master" ]]; then + pip install tutor==18.2.2 elif [[ "${{ matrix.edx_branch }}" == "master" ]]; then git clone --branch=main https://github.com/overhangio/tutor.git pip install -e "./tutor" else - pip install tutor==18.0.0 + pip install tutor==19.0.0 fi - name: Set up tutor with edx-platform @@ -47,7 +47,6 @@ jobs: cd edx-platform git checkout ${{ matrix.edx_branch }} tutor mounts add . - tutor images build openedx-dev tutor dev launch --non-interactive tutor dev stop diff --git a/run_devstack_integration_tests.sh b/run_devstack_integration_tests.sh index 9be8adfff..3753a99e4 100755 --- a/run_devstack_integration_tests.sh +++ b/run_devstack_integration_tests.sh @@ -8,15 +8,12 @@ pwd mkdir -p reports pip install -r ./requirements/edx/testing.txt -pip install -r ./requirements/edx/paver.txt # Installing edx-platform pip install -e . -mkdir -p test_root # for edx -paver update_assets lms --settings=test_static_optimized +cp -r /openedx/staticfiles test_root/staticfiles -cp test_root/staticfiles/lms/webpack-stats.json test_root/staticfiles/webpack-stats.json cd /open-edx-plugins # Installing test dependencies