revert: revert: build: finish replacing paver assets #34701
Merged
+375
−633
Conversation
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 reverts commit 4c0284b.
There was a logical error in the compile_sass management command: instead of falling back to settings.COMPREHENSIVE_THEME_DIRS when --theme-dirs was *None or missing*, we only fell back to it when --theme-dirs was *missing*. This caused theme compilation to be skipped when COMREHENSIVE_THEME_DIRS *is not set* in the environment, even though settings.COMPREHENSIVE_THEME_DIRS *is set* in Django settings, which is currently the case for edx.org.
kdmccormick
changed the title
This was referenced May 6, 2024
feanil
approved these changes
May 6, 2024
|
2U Release Notice: This PR has been deployed to the edX staging environment in preparation for a release to production. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Re-merges:
plus a fix, in its own commit:
fix: fall back to settings.COMPREHENSIVE_THEME_DIRS correctly
There was a logical error in the compile_sass management command:
instead of falling back to settings.COMPREHENSIVE_THEME_DIRS when
--theme-dirs was None or missing, we only fell back to it when
--theme-dirs was missing.
This caused theme compilation to be skipped when COMREHENSIVE_THEME_DIRS
is not set in the environment, even though
settings.COMPREHENSIVE_THEME_DIRS is set in Django settings, which
is currently the case for edx.org.