From 5e3dc587afddc91d035087b0fb73eca037f3c712 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20D=C3=A9ramond?= <juderamond@gmail.com>
Date: Thu, 13 Apr 2023 08:47:56 +0200
Subject: [PATCH] node-sass workflow: improve error message when Sass vars are
found (#38448)
Co-authored-by: XhmikosR <xhmikosr@gmail.com>
---
.github/workflows/node-sass.yml | 11 ++++++-----
.gitignore | 1 +
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/node-sass.yml b/.github/workflows/node-sass.yml
index d83e3e70f7..c558e447af 100644
--- a/.github/workflows/node-sass.yml
+++ b/.github/workflows/node-sass.yml
@@ -35,14 +35,15 @@ jobs:
npx --package node-sass@latest node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/ -o dist-sass/css/
ls -Al dist-sass/css
- # Check that there are no Sass variables (`$`)
- - name: Check built CSS files
+ - name: Check built CSS files for Sass variables
shell: bash
run: |
- if [[ $(find dist-sass/css/ -name "*.css" | xargs grep -F "\$" | wc -l | bc) -eq 0 ]]; then
- echo "All good, no Sass variables found"
+ SASS_VARS_FOUND=$(find "dist-sass/css/" -type f -name "*.css" -print0 | xargs -0 --no-run-if-empty grep -F "\$" || true)
+ if [[ -z "$SASS_VARS_FOUND" ]]; then
+ echo "All good, no Sass variables found!"
exit 0
else
- echo "Found Sass variables!"
+ echo "Found $(echo "$SASS_VARS_FOUND" | wc -l | bc) Sass variables:"
+ echo "$SASS_VARS_FOUND"
exit 1
fi
diff --git a/.gitignore b/.gitignore
index 2215d636ad..0c9b6f5565 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,5 +38,6 @@ Thumbs.db
*.komodoproject
# Folders to ignore
+/dist-sass/
/js/coverage/
/node_modules/