diff --git a/.drone.yml b/.drone.yml index 1cddc80d40..222523d015 100644 --- a/.drone.yml +++ b/.drone.yml @@ -60,6 +60,7 @@ steps: commands: - make css - make js + - bash -c '[ -z "$(git status --porcelain public/js public/css)" ] || (echo "Generated js/css files do not match" && git status --porcelain public/js public/css && exit 1)' - name: build-without-gcc pull: always diff --git a/Makefile b/Makefile index a87de5b6f9..9f15daa312 100644 --- a/Makefile +++ b/Makefile @@ -444,13 +444,6 @@ css: npm $(foreach file, $(filter-out web_src/less/themes/_base.less, $(wildcard web_src/less/themes/*)),npx lessc --clean-css="--s0 -b" web_src/less/themes/$(notdir $(file)) > public/css/theme-$(notdir $(call strip-suffix,$(file))).css;) npx postcss --use autoprefixer --no-map --replace public/css/* - @diff=$$(git diff public/css/*); \ - if ([ -n "$$CI" ] && [ -n "$$diff" ]); then \ - echo "Generated files in public/css have changed, please commit the result:"; \ - echo "$${diff}"; \ - exit 1; \ - fi; - .PHONY: javascripts javascripts: echo "'make javascripts' is deprecated, please use 'make js'"