Skip to content

Commit

Permalink
build: git-ignore static asset artifacts whether they are links or dirs
Browse files Browse the repository at this point in the history
Remove the trailing slashes from the .gitignore entries for static asset
build artifacts. With these slashes, only directory contents are
ignored. Without these slashes, the artifact is ignored whether it is a
directory *or* an actual file (particularly, in our case: a symlink).

This allows us to build edx-platform static assets into a separate
directory, and then symlink to them from edx-platform.

Also: We remove the duplicate cms/static/css/ gitignore entry.

Backport of: 1f41529
  • Loading branch information
kdmccormick committed Jun 17, 2024
1 parent 28ddf51 commit 6ab0b7a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
1 change: 0 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ common/test/data/badges/*.png
### Static assets pipeline artifacts
**/*.scssc
lms/static/css/
!lms/static/css/vendor
lms/static/certificates/css/
cms/static/css/
common/static/common/js/vendor/
Expand Down
11 changes: 5 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,11 @@ bin/

### Static assets pipeline artifacts
*.scssc
lms/static/css/
lms/static/certificates/css/
cms/static/css/
common/static/common/js/vendor/
common/static/common/css/vendor/
lms/static/css
lms/static/certificates/css
cms/static/css
common/static/common/js/vendor
common/static/common/css/vendor
common/static/bundles
webpack-stats.json

Expand All @@ -115,7 +115,6 @@ lms/static/sass/*.css
lms/static/sass/*.css.map
lms/static/certificates/sass/*.css
lms/static/themed_sass/
cms/static/css/
cms/static/sass/*.css
cms/static/sass/*.css.map
cms/static/themed_sass/
Expand Down

0 comments on commit 6ab0b7a

Please sign in to comment.