From 1f41529a763ca16f7670f65a700901443845f340 Mon Sep 17 00:00:00 2001 From: "Kyle D. McCormick" Date: Mon, 3 Jun 2024 08:50:26 -0400 Subject: [PATCH] build: git-ignore static asset artifacts whether they are links or dirs 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. --- .dockerignore | 1 - .gitignore | 11 +++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.dockerignore b/.dockerignore index 1665783ba4..c3873d33a5 100644 --- a/.dockerignore +++ b/.dockerignore @@ -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/ diff --git a/.gitignore b/.gitignore index 0d020e45fc..aaeb22eef1 100644 --- a/.gitignore +++ b/.gitignore @@ -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 @@ -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/