Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

move fomantic target, update 'make help' #9945

Merged
merged 2 commits into from
Jan 23, 2020
Merged

move fomantic target, update 'make help' #9945

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e994ac
move fomantic target, update 'make help'
silverwind Jan 22, 2020
e76206b
Merge branch 'master' into fomantic-make
lunny Jan 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,11 @@ help:
@echo " - clean-all delete all generated files (integration test, build, css and js files)"
@echo " - css rebuild only css files"
@echo " - js rebuild only js files"
@echo " - generate run \"make css js\" and \"go generate\""
@echo " - fomantic rebuild fomantic-ui files"
@echo " - generate run \"make fomantic css js\" and \"go generate\""
@echo " - fmt format the code"
@echo " - generate-swagger generate the swagger spec from code comments"
@echo " - swagger-validate check if the swagger spec is valide"
@echo " - swagger-validate check if the swagger spec is valid"
@echo " - revive run code linter revive"
@echo " - misspell check if a word is written wrong"
@echo " - vet examines Go source code and reports suspicious constructs"
Expand Down Expand Up @@ -159,7 +160,7 @@ vet:
$(GO) vet $(PACKAGES)

.PHONY: generate
generate: js css
generate: fomantic js css
GO111MODULE=on $(GO) generate -mod=vendor $(PACKAGES)

.PHONY: generate-swagger
Expand Down Expand Up @@ -475,7 +476,7 @@ npm-update: node-check node_modules
npm install --package-lock

.PHONY: js
js: node-check fomantic $(JS_DEST)
js: node-check $(JS_DEST)

$(JS_DEST): node_modules $(JS_SOURCES)
npx eslint web_src/js webpack.config.js
Expand All @@ -489,7 +490,7 @@ $(FOMANTIC_DEST_DIR): node_modules semantic.json web_src/fomantic/theme.config.l
npx gulp -f node_modules/fomantic-ui/gulpfile.js build

.PHONY: css
css: node-check fomantic $(CSS_DEST)
css: node-check $(CSS_DEST)

$(CSS_DEST): node_modules $(CSS_SOURCES)
npx stylelint web_src/less
Expand Down