Reverts #34554, which causes compilation of edX.org's legacy comprehensive theme to be skipped in their deployment pipeline. We have not determined the precise cause yet, but it seems like the compile_sass management command is not correctly getting the list of comprehensive theme directories from Django settings.
This commit is contained in:
@@ -39,7 +39,6 @@ When refering to XBlocks, we use the entry-point name. For example,
|
||||
# pylint: disable=unused-import, useless-suppression, wrong-import-order, wrong-import-position
|
||||
|
||||
import importlib.util
|
||||
import json
|
||||
import os
|
||||
import sys
|
||||
|
||||
@@ -1276,11 +1275,14 @@ EDX_PLATFORM_REVISION = 'release'
|
||||
|
||||
# Static content
|
||||
STATIC_URL = '/static/studio/'
|
||||
STATIC_ROOT = os.environ.get('STATIC_ROOT_CMS', ENV_ROOT / 'staticfiles' / 'studio')
|
||||
STATIC_ROOT = ENV_ROOT / "staticfiles" / 'studio'
|
||||
|
||||
STATICFILES_DIRS = [
|
||||
COMMON_ROOT / "static",
|
||||
PROJECT_ROOT / "static",
|
||||
|
||||
# This is how you would use the textbook images locally
|
||||
# ("book", ENV_ROOT / "book_images"),
|
||||
]
|
||||
|
||||
# Locale/Internationalization
|
||||
@@ -1320,16 +1322,11 @@ COURSE_METADATA_EXPORT_STORAGE = 'django.core.files.storage.FileSystemStorage'
|
||||
EMBARGO_SITE_REDIRECT_URL = None
|
||||
|
||||
##### custom vendor plugin variables #####
|
||||
|
||||
# .. setting_name: JS_ENV_EXTRA_CONFIG
|
||||
# .. setting_default: {}
|
||||
# .. setting_description: JavaScript code can access this dictionary using `process.env.JS_ENV_EXTRA_CONFIG`
|
||||
# One of the current use cases for this is enabling custom TinyMCE plugins
|
||||
# (TINYMCE_ADDITIONAL_PLUGINS) and overriding the TinyMCE configuration (TINYMCE_CONFIG_OVERRIDES).
|
||||
# .. setting_warning: This Django setting is DEPRECATED! Starting in Sumac, Webpack will no longer
|
||||
# use Django settings. Please set the JS_ENV_EXTRA_CONFIG environment variable to an equivalent JSON
|
||||
# string instead. For details, see: https://github.com/openedx/edx-platform/issues/31895
|
||||
JS_ENV_EXTRA_CONFIG = json.loads(os.environ.get('JS_ENV_EXTRA_CONFIG', '{}'))
|
||||
# JavaScript code can access this data using `process.env.JS_ENV_EXTRA_CONFIG`
|
||||
# One of the current use cases for this is enabling custom TinyMCE plugins
|
||||
# (TINYMCE_ADDITIONAL_PLUGINS) and overriding the TinyMCE configuration
|
||||
# (TINYMCE_CONFIG_OVERRIDES).
|
||||
JS_ENV_EXTRA_CONFIG = {}
|
||||
|
||||
############################### PIPELINE #######################################
|
||||
|
||||
@@ -1506,14 +1503,7 @@ WEBPACK_LOADER = {
|
||||
'STATS_FILE': os.path.join(STATIC_ROOT, 'webpack-worker-stats.json')
|
||||
}
|
||||
}
|
||||
|
||||
# .. setting_name: WEBPACK_CONFIG_PATH
|
||||
# .. setting_default: "webpack.prod.config.js"
|
||||
# .. setting_description: Path to the Webpack configuration file. Used by Paver scripts.
|
||||
# .. setting_warning: This Django setting is DEPRECATED! Starting in Sumac, Webpack will no longer
|
||||
# use Django settings. Please set the WEBPACK_CONFIG_PATH environment variable instead. For details,
|
||||
# see: https://github.com/openedx/edx-platform/issues/31895
|
||||
WEBPACK_CONFIG_PATH = os.environ.get('WEBPACK_CONFIG_PATH', 'webpack.prod.config.js')
|
||||
WEBPACK_CONFIG_PATH = 'webpack.prod.config.js'
|
||||
|
||||
|
||||
############################ SERVICE_VARIANT ##################################
|
||||
@@ -2190,11 +2180,8 @@ CREDIT_PROVIDER_SECRET_KEYS = {}
|
||||
|
||||
# .. setting_name: COMPREHENSIVE_THEME_DIRS
|
||||
# .. setting_default: []
|
||||
# .. setting_description: A list of paths to directories, each of which will
|
||||
# be searched for comprehensive themes. Do not override this Django setting directly.
|
||||
# Instead, set the COMPREHENSIVE_THEME_DIRS environment variable, using colons (:) to
|
||||
# separate paths.
|
||||
COMPREHENSIVE_THEME_DIRS = os.environ.get("COMPREHENSIVE_THEME_DIRS", "").split(":")
|
||||
# .. setting_description: See LMS annotation.
|
||||
COMPREHENSIVE_THEME_DIRS = []
|
||||
|
||||
# .. setting_name: COMPREHENSIVE_THEME_LOCALE_PATHS
|
||||
# .. setting_default: []
|
||||
|
||||
Reference in New Issue
Block a user