1
0
Fork 0

Merge branch 'main' into bw-dev-npm-fix

This commit is contained in:
Mouse Reeve 2022-06-11 20:39:18 -07:00 committed by GitHub
commit 51f445bc72
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
220 changed files with 17881 additions and 4815 deletions

9
bw-dev
View file

@ -116,6 +116,7 @@ case "$CMD" in
git fetch origin l10n_main:l10n_main
git checkout l10n_main locale/de_DE
git checkout l10n_main locale/es_ES
git checkout l10n_main locale/fi_FI
git checkout l10n_main locale/fr_FR
git checkout l10n_main locale/gl_ES
git checkout l10n_main locale/it_IT
@ -123,6 +124,7 @@ case "$CMD" in
git checkout l10n_main locale/no_NO
git checkout l10n_main locale/pt_PT
git checkout l10n_main locale/pt_BR
git checkout l10n_main locale/ro_RO
git checkout l10n_main locale/sv_SE
git checkout l10n_main locale/zh_Hans
git checkout l10n_main locale/zh_Hant
@ -138,6 +140,10 @@ case "$CMD" in
black)
docker-compose run --rm dev-tools black celerywyrm bookwyrm
;;
pylint)
# pylint depends on having the app dependencies in place, so we run it in the web container
runweb pylint bookwyrm/
;;
prettier)
docker-compose run --rm dev-tools npm exec --prefix dev-tools -- prettier \
--write bookwyrm/static/js/*.js
@ -148,6 +154,7 @@ case "$CMD" in
bookwyrm/static/css
;;
formatters)
runweb pylint bookwyrm/
docker-compose run --rm dev-tools black celerywyrm bookwyrm
docker-compose run --rm dev-tools npm exec --prefix dev-tools -- prettier \
--write bookwyrm/static/js/*.js
@ -165,7 +172,7 @@ case "$CMD" in
update)
git pull
docker-compose build
./update.sh
# ./update.sh
runweb python manage.py migrate
runweb python manage.py collectstatic --no-input
docker-compose up -d