From 4b4cc750b9d5f4816ae81d4bcb662f5b9f723e0b Mon Sep 17 00:00:00 2001 From: monirzadeh <25131576+Monirzadeh@users.noreply.github.com> Date: Tue, 3 Oct 2023 12:41:22 +0330 Subject: [PATCH 1/3] styles-check just work on less and css directory --- scripts/styles_check.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/styles_check.sh b/scripts/styles_check.sh index a73993ac1..41cadaae5 100755 --- a/scripts/styles_check.sh +++ b/scripts/styles_check.sh @@ -3,14 +3,14 @@ # This script is used to check if the style.css file is up to date. # Check if the git tree for CWD is clean -if [ -n "$(git status --porcelain)" ]; then +if [ -n "$(git status internal/view/assets/less internal/view/assets/css --porcelain)" ]; then echo "❌ git tree is not clean. Please commit all changes before running this script." exit 1 fi # Check style.css file CLEANCSS_OPTS=${CLEANCSS_OPTS} make styles -if [ -n "$(git status --porcelain)" ]; then +if [ -n "$(git status internal/view/assets/less internal/view/assets/css --porcelain)" ]; then echo "❌ style.css wasn't built from less changes. Please run 'make styles' and commit the changes." git reset --hard exit 1 From 3c85db66872445226d2fd464540e9df8704774f8 Mon Sep 17 00:00:00 2001 From: monirzadeh <25131576+Monirzadeh@users.noreply.github.com> Date: Wed, 4 Oct 2023 18:32:22 +0330 Subject: [PATCH 2/3] just cheack css directory --- scripts/styles_check.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/styles_check.sh b/scripts/styles_check.sh index 41cadaae5..2e2cc0582 100755 --- a/scripts/styles_check.sh +++ b/scripts/styles_check.sh @@ -3,15 +3,15 @@ # This script is used to check if the style.css file is up to date. # Check if the git tree for CWD is clean -if [ -n "$(git status internal/view/assets/less internal/view/assets/css --porcelain)" ]; then +if [ -n "$(git status internal/view/assets/css --porcelain)" ]; then echo "❌ git tree is not clean. Please commit all changes before running this script." exit 1 fi # Check style.css file CLEANCSS_OPTS=${CLEANCSS_OPTS} make styles -if [ -n "$(git status internal/view/assets/less internal/view/assets/css --porcelain)" ]; then +if [ -n "$(git status internal/view/assets/css --porcelain)" ]; then echo "❌ style.css wasn't built from less changes. Please run 'make styles' and commit the changes." - git reset --hard + git checkout -- internal/view/assets/css/ exit 1 fi From edc010c9efe182fb22c7e2c8dbb10bb4f09738b6 Mon Sep 17 00:00:00 2001 From: monirzadeh <25131576+Monirzadeh@users.noreply.github.com> Date: Wed, 4 Oct 2023 18:54:32 +0330 Subject: [PATCH 3/3] make swag-check just monitor generated files --- scripts/swagger_check.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/swagger_check.sh b/scripts/swagger_check.sh index 282bde2e6..ee6105c84 100644 --- a/scripts/swagger_check.sh +++ b/scripts/swagger_check.sh @@ -10,7 +10,7 @@ if [ "$CURRENT_SWAG_VERSION" != "$REQUIRED_SWAG_VERSION" ]; then fi # Check if the git tree for CWD is clean -if [ -n "$(git status --porcelain)" ]; then +if [ -n "$(git status docs/swagger --porcelain)" ]; then echo "❌ git tree is not clean. Please commit all changes before running this script." git diff exit 1 @@ -18,18 +18,18 @@ fi # Check swag comments make swag-fmt -if [ -n "$(git status --porcelain)" ]; then +if [ -n "$(git status docs/swagger --porcelain)" ]; then echo "❌ swag comments are not formatted. Please run 'make swag-fmt' and commit the changes." git diff - git reset --hard + git checkout -- docs/swagger exit 1 fi # Check swagger documentation make swagger -if [ -n "$(git status --porcelain)" ]; then +if [ -n "$(git status docs/swagger --porcelain)" ]; then echo "❌ swagger documentation not updated, please run 'make swagger' and commit the changes." git diff - git reset --hard + git checkout -- docs/swagger exit 1 fi