Merge branch 'esds-3.0-vue3-primevue' into ced-1793-nav-and-footer

EnergySage · Sep 19, 2024 · feaf440 · feaf440
2 parents 9eac435 + 648852b
commit feaf440
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -39,12 +39,7 @@ jobs:
               run: make build
 
             - name: Run linter 👀
-              id: linting
               run: make lint
 
-            - name: Linting failure message
-              if: ${{ failure() && steps.linting.conclusion == 'failure' }}
-              run: echo "Linting failed. Run `make format` to apply automatic fixes and show remaining problems."
-
             - name: Run tests 🧪
               run: make test
diff --git a/Makefile b/Makefile
@@ -22,9 +22,9 @@ unlink:
 
 .PHONY: lint
 lint:
-	npm --prefix es-ds-styles run lint
-	npm --prefix es-ds-components run lint
-	npm --prefix es-ds-docs run lint
+	npm --prefix es-ds-styles run lint || { echo "Linting failed. Forgot to run 'make format'?"; exit 1; }
+	npm --prefix es-ds-components run lint || { echo "Linting failed. Forgot to run 'make format'?"; exit 1; }
+	npm --prefix es-ds-docs run lint || { echo "Linting failed. Forgot to run 'make format'?"; exit 1; }
 
 .PHONY: format
 format: