From 434f1ec542cc6dab6b2709e3a6fab261bdad4c7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=B4=9C=C9=B4=E1=B4=8B=C9=B4=E1=B4=A1=E1=B4=8F=C9=B4?= Date: Wed, 11 Mar 2020 03:02:18 +0800 Subject: [PATCH] all: clean up dot files (#5983) --- .codebeatignore | 7 ------- .codebeatsettings | 7 ------- .dockerignore | 5 ++--- .editorconfig | 2 +- .gitignore | 1 - Makefile | 11 ++++------- 6 files changed, 7 insertions(+), 26 deletions(-) delete mode 100644 .codebeatignore delete mode 100644 .codebeatsettings diff --git a/.codebeatignore b/.codebeatignore deleted file mode 100644 index bfb9b911b..000000000 --- a/.codebeatignore +++ /dev/null @@ -1,7 +0,0 @@ -conf/** -docker/** -modules/bindata/** -packager/** -public/** -scripts/** -templates/** \ No newline at end of file diff --git a/.codebeatsettings b/.codebeatsettings deleted file mode 100644 index c6ee5c981..000000000 --- a/.codebeatsettings +++ /dev/null @@ -1,7 +0,0 @@ -{ - "GOLANG": { - "TOTAL_LOC": [500, 999, 1999, 9999], - "TOO_MANY_FUNCTIONS": [50, 99, 199, 999], - "TOO_MANY_IVARS": [20, 50, 70, 99] - } -} \ No newline at end of file diff --git a/.dockerignore b/.dockerignore index 823e8dd92..c2f70d14d 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,5 +1,5 @@ -packager -packager/** +.packager +.packager/** scripts scripts/** .github/ @@ -8,7 +8,6 @@ config.codekit .dockerignore *.yml *.md -.bra.toml .editorconfig .gitignore Dockerfile* diff --git a/.editorconfig b/.editorconfig index cd71e6b29..ce737a78e 100644 --- a/.editorconfig +++ b/.editorconfig @@ -16,7 +16,7 @@ indent_size = 4 indent_style = tab indent_size = 2 -[*.{less,yml}] +[*.{less, yml}] indent_style = space indent_size = 2 diff --git a/.gitignore b/.gitignore index dfc62ee68..db7890854 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,6 @@ log/ custom/ data/ -.vendor/ .idea/ *.iml public/img/avatar/ diff --git a/Makefile b/Makefile index 95ae58c7c..c8b39d2cc 100644 --- a/Makefile +++ b/Makefile @@ -8,17 +8,14 @@ LESS_FILES := $(wildcard public/less/*.less) ASSETS_GENERATED := internal/assets/conf/conf_gen.go internal/assets/templates/templates_gen.go internal/assets/public/public_gen.go GENERATED := $(ASSETS_GENERATED) public/css/gogs.css -OS := $(shell uname) - TAGS = "" BUILD_FLAGS = "-v" RELEASE_ROOT = "release" RELEASE_GOGS = "release/gogs" NOW = $(shell date -u '+%Y%m%d%I%M%S') -GOVET = go tool vet -composites=false -methods=false -structtags=false -.PHONY: build pack release generate clean +.PHONY: check dist build build-no-gen pack release generate less clean test fixme todo legacy .IGNORE: public/css/gogs.css @@ -67,7 +64,7 @@ less: public/css/gogs.css public/css/gogs.css: $(LESS_FILES) @type lessc >/dev/null 2>&1 && lessc --source-map "public/less/gogs.less" $@ || echo "lessc command not found or failed" -clean-mac: +clean: find . -name "*.DS_Store" -type f -delete test: @@ -79,6 +76,6 @@ fixme: todo: grep -rnw "TODO" internal -# Legacy code should be remove by the time of release +# Legacy code should be removed by the time of release legacy: - grep -rnw "\(LEGACY\|DEPRECATED\)" internal + grep -rnw "\(LEGACY\|Deprecated\)" internal