summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorsilverwind <me@silverwind.io>2020-03-29 13:56:58 +0200
committerGitHub <noreply@github.com>2020-03-29 12:56:58 +0100
commitad4026431b155cb7007bd7b0eaecc33a792efe0b (patch)
treea272fba1c4adf439a2c3ff233422c33d24527ea8 /Makefile
parent3f0cb8b33a6e96a12498c9d5c2ae8dda44a13a62 (diff)
downloadgitea-ad4026431b155cb7007bd7b0eaecc33a792efe0b.tar.gz
gitea-ad4026431b155cb7007bd7b0eaecc33a792efe0b.zip
Add 'make lint', restructure 'compliance' pipeline (#10861)
- Added 'lint', 'lint-frontend', 'lint-backend' targets - Added 'lint-frontend', 'lint-backend' ci steps and restructure the 'compliance' pipeline to have a clear separation between frontend and backend and use parallelism where possible. Also, the main build pipelines now depend on 'compliance' so they will skip if it fails. - Added dependencies on ci steps so they skip when 'compliance' fails - Moved JS linters to devDependencies - Removed deprecated 'js' and 'css' targets
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile33
1 files changed, 18 insertions, 15 deletions
diff --git a/Makefile b/Makefile
index 4cdc536a0d..745cdb2601 100644
--- a/Makefile
+++ b/Makefile
@@ -69,7 +69,7 @@ LDFLAGS := $(LDFLAGS) -X "main.MakeVersion=$(MAKE_VERSION)" -X "main.Version=$(G
GO_PACKAGES ?= $(filter-out code.gitea.io/gitea/integrations/migration-test,$(filter-out code.gitea.io/gitea/integrations,$(shell GO111MODULE=on $(GO) list -mod=vendor ./... | grep -v /vendor/)))
WEBPACK_SOURCES := $(shell find web_src/js web_src/less -type f)
-WEBPACK_CONFIGS := webpack.config.js .eslintrc .stylelintrc
+WEBPACK_CONFIGS := webpack.config.js
WEBPACK_DEST := public/js/index.js public/css/index.css
WEBPACK_DEST_DIRS := public/js public/css
@@ -133,14 +133,18 @@ help:
@echo " - backend build backend files"
@echo " - clean delete backend and integration files"
@echo " - clean-all delete backend, frontend and integration files"
+ @echo " - lint lint everything"
+ @echo " - lint-frontend lint frontend files"
+ @echo " - lint-backend lint backend files"
@echo " - webpack build webpack files"
@echo " - fomantic build fomantic files"
@echo " - generate run \"go generate\""
@echo " - fmt format the Go code"
@echo " - generate-swagger generate the swagger spec from code comments"
@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 " - golangci-lint run golangci-lint linter"
+ @echo " - revive run revive linter"
+ @echo " - misspell check for misspellings"
@echo " - vet examines Go source code and reports suspicious constructs"
@echo " - test run unit test"
@echo " - test-sqlite run integration test for sqlite"
@@ -259,6 +263,17 @@ fmt-check:
exit 1; \
fi;
+.PHONY: lint
+lint: lint-backend lint-frontend
+
+.PHONY: lint-backend
+lint-backend: golangci-lint revive swagger-check swagger-validate test-vendor
+
+.PHONY: lint-frontend
+lint-frontend: node_modules
+ npx eslint web_src/js webpack.config.js
+ npx stylelint web_src/less
+
.PHONY: test
test:
GO111MODULE=on $(GO) test $(GOTESTFLAGS) -mod=vendor -tags='sqlite sqlite_unlock_notify' $(GO_PACKAGES)
@@ -540,16 +555,6 @@ npm-update: node-check | node_modules
rm -rf node_modules package-lock.json
npm install --package-lock
-.PHONY: js
-js:
- @echo "'make js' is deprecated, please use 'make webpack'"
- $(MAKE) webpack
-
-.PHONY: css
-css:
- @echo "'make css' is deprecated, please use 'make webpack'"
- $(MAKE) webpack
-
.PHONY: fomantic
fomantic: $(FOMANTIC_DEST)
@@ -564,8 +569,6 @@ $(FOMANTIC_DEST): $(FOMANTIC_CONFIGS) package-lock.json | node_modules
webpack: $(WEBPACK_DEST)
$(WEBPACK_DEST): $(WEBPACK_SOURCES) $(WEBPACK_CONFIGS) package-lock.json | node_modules
- npx eslint web_src/js webpack.config.js
- npx stylelint web_src/less
npx webpack --hide-modules --display-entrypoints=false
@touch $(WEBPACK_DEST)