Skip to content

Commit

Permalink
[DONE] Develop #3.1.1 (#788)
Browse files Browse the repository at this point in the history
* 🐛 podfile fix pagination display (#787)
* improve clean_video_files and code cleaning (#782)
* Fix wrong url of paginated sub-themes (#789)
* Add "help" command to makefile (#792)
* Ptitloup/fix thumbnail (#790)
* Hide channel desc (#794)
* fix podfile (#798)
* Correct podfile sidebar (#799)
* Ptitloup/fix link playlist (#801)
* Fix video theme (#800)


---------
Co-authored-by: MattBild <34771705+mattbild@users.noreply.github.com>
Co-authored-by: Olivier Bado-Faustin <bado@unice.fr>
Co-authored-by: pampletousse <51699553+pampletousse@users.noreply.github.com>
  • Loading branch information
ptitloup committed Apr 12, 2023
1 parent 533a0e4 commit 859664a
Show file tree
Hide file tree
Showing 65 changed files with 2,079 additions and 1,911 deletions.
28 changes: 17 additions & 11 deletions .github/workflows/pod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
max-parallel: 4
matrix:
python-version: [3.7, 3.8, 3.9] # , 3.10.6
python-version: ['3.8', '3.9', '3.10']

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -61,48 +61,46 @@ jobs:

- name: Setup Pod
run: |
python manage.py create_pod_index --settings=pod.main.test_settings
coverage run --source='.' manage.py create_pod_index --settings=pod.main.test_settings
python manage.py makemigrations --settings=pod.main.test_settings
python manage.py migrate --settings=pod.main.test_settings
cd pod
yarn
- name: Run Tests and coveralls
- name: Run Tests with coverage
env:
PYTHONUNBUFFERED: 1
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
coverage run --source='.' manage.py test -v 3 --settings=pod.main.test_settings
coveralls --service=github
coverage run --append --source='.' manage.py test -v 3 --settings=pod.main.test_settings
## Start Accessibility tests with pa11y ##

- name: Install pa11y-ci dependencies.
if: matrix.python-version == 3.9
if: matrix.python-version == '3.9'
run: |
npm install -g Badatos/pa11y-ci
- name: Run Django test server
if: matrix.python-version == 3.9
if: matrix.python-version == '3.9'
env:
PYTHONUNBUFFERED: 1
run: |
python manage.py loaddata pod/video/fixtures/initial_data.json --settings=pod.main.test_settings
python manage.py loaddata pod/main/fixtures/initial_data.json --settings=pod.main.test_settings
python manage.py loaddata pod/video/fixtures/sample_videos.json --settings=pod.main.test_settings
python manage.py collectstatic --clear --settings=pod.main.test_settings
python manage.py runserver localhost:9090 --insecure --settings=pod.main.test_settings &
coverage run --append --source='.' manage.py runserver localhost:9090 --insecure --settings=pod.main.test_settings &
sleep 5
- name: Run pa11y-ci.
if: matrix.python-version == 3.9
if: matrix.python-version == '3.9'
# tee reads `stdin` and writes it to both `stdout` and a file
run: |
pa11y-ci 2>&1 | tee pa11y_output.txt
- name: Read pa11y_output file.
id: pa11y_output
if: matrix.python-version == 3.9
if: matrix.python-version == '3.9'
uses: juliangruber/read-file-action@v1
with:
path: ./pa11y_output.txt
Expand All @@ -126,3 +124,11 @@ ${{ steps.pa11y_output.outputs.content }}```
run: |
echo "::error::The site is failing accessibility tests. Please review the comment in the pull request or the pa11y-ci step in the workflow for details."
exit 1
- name: Send coverage to coveralls.io
# coveralls command has been installed by requirements-dev.txt
if: matrix.python-version == '3.9'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run:
coveralls --service=github
10 changes: 6 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,13 @@ settings_local.py
scripts/bbb-pod-live/docker-compose.yml
transcription/*

# Unit test utilities #
#######################
chromedriver

## Others
pod/static/
*.bak
*.pem
.coverage
htmlcov
compile-model
Expand All @@ -69,6 +72,7 @@ compile-model
################
*.crt
*.key
*.pem

# NPM stuffs #
################
Expand All @@ -82,7 +86,5 @@ tmp-local/
portainer-data
v8-compile-cache-0
pod/db_migrations
pod/log
pod/media
pod/node_modules/*
tmp/
pod/.yarn

0 comments on commit 859664a

Please sign in to comment.