parent
4f9443cf8e
commit
9feab29405
|
@ -60,6 +60,7 @@ steps:
|
||||||
commands:
|
commands:
|
||||||
- make css
|
- make css
|
||||||
- make js
|
- 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
|
- name: build-without-gcc
|
||||||
pull: always
|
pull: always
|
||||||
|
|
7
Makefile
7
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;)
|
$(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/*
|
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
|
.PHONY: javascripts
|
||||||
javascripts:
|
javascripts:
|
||||||
echo "'make javascripts' is deprecated, please use 'make js'"
|
echo "'make javascripts' is deprecated, please use 'make js'"
|
||||||
|
|
Loading…
Reference in New Issue