forked from openedx-unsupported/configuration
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #143 from edx/timmc/paver6
Attempt #6 at removing paver
- Loading branch information
Showing
13 changed files
with
35 additions
and
180 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 22 additions & 3 deletions
25
playbooks/roles/edxapp/templates/edx/bin/edxapp-update-assets.j2
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,32 @@ | ||
{% include "edxapp_common.j2" %} | ||
|
||
export WEBPACK_CONFIG_PATH=webpack.prod.config.js | ||
export STATIC_ROOT_LMS=/edx/var/edxapp/staticfiles | ||
export STATIC_ROOT_CMS=/edx/var/edxapp/staticfiles/studio | ||
# This is necessary to properly build webworkers, which depends on this value being a dictionary. | ||
export JS_ENV_EXTRA_CONFIG={} | ||
|
||
|
||
# We need to make a call to a management command before running webpack because proctoring runs a webpack | ||
# webworker that only gets built if the proctoring djangoapp writes out a `workers.json`: | ||
# https://github.com/openedx/edx-proctoring/blob/73c7f55e2be91324fa07fec6e6ac0a667fdd8412/edx_proctoring/apps.py#L4 | ||
{% if edxapp_staticfiles_storage_overrides %} | ||
{% for override in edxapp_staticfiles_storage_overrides %} | ||
export STATICFILES_STORAGE={{ override | quote }} | ||
sudo -E -H -u {{ edxapp_user }} \ | ||
env "PATH=$PATH" "STATICFILES_STORAGE={{ override }}" \ | ||
{{ edxapp_venv_bin }}/paver update_assets --debug-collect --settings=$EDX_PLATFORM_SETTINGS | ||
env "PATH=$PATH" \ | ||
{{ edxapp_venv_bin }}/python manage.py lms --settings=$EDX_PLATFORM_SETTINGS print_setting STATIC_ROOT WEBPACK_CONFIG_PATH \ | ||
&& npm run webpack \ | ||
&& npm run compile-sass -- --theme-dir /edx/var/edx-themes/edx-themes/edx-platform --theme-dir /edx/app/edxapp/edx-platform/themes \ | ||
&& {{ edxapp_venv_bin }}/python manage.py lms collectstatic --noinput --settings=$EDX_PLATFORM_SETTINGS \ | ||
&& {{ edxapp_venv_bin }}/python manage.py cms collectstatic --noinput --settings=$EDX_PLATFORM_SETTINGS | ||
{% endfor %} | ||
{% else %} | ||
sudo -E -H -u {{ edxapp_user }} \ | ||
env "PATH=$PATH" \ | ||
{{ edxapp_venv_bin }}/paver update_assets --debug-collect --settings $EDX_PLATFORM_SETTINGS | ||
{{ edxapp_venv_bin }}/python manage.py lms --settings=$EDX_PLATFORM_SETTINGS print_setting STATIC_ROOT WEBPACK_CONFIG_PATH \ | ||
&& npm run webpack \ | ||
&& npm run compile-sass -- --theme-dir /edx/var/edx-themes/edx-themes/edx-platform --theme-dir /edx/app/edxapp/edx-platform/themes \ | ||
&& {{ edxapp_venv_bin }}/python manage.py lms collectstatic --noinput --settings=$EDX_PLATFORM_SETTINGS \ | ||
&& {{ edxapp_venv_bin }}/python manage.py cms collectstatic --noinput --settings=$EDX_PLATFORM_SETTINGS | ||
{% endif %} |
This file was deleted.
Oops, something went wrong.
56 changes: 0 additions & 56 deletions
56
playbooks/roles/test_build_server/files/test-development-environment.sh
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.