summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorEarl Warren <earl-warren@noreply.codeberg.org>2024-06-11 12:37:26 +0200
committerEarl Warren <earl-warren@noreply.codeberg.org>2024-06-11 12:37:26 +0200
commitdf373c9f7ece5826feafdb9e15a1bc59066731e2 (patch)
tree1db862a6075b8a165283c833ea199e6842916f6c /Makefile
parentMerge pull request 'Update dependency @github/relative-time-element to v4.4.2... (diff)
parentdocs(release): week 2024-24 cherry pick (diff)
downloadforgejo-df373c9f7ece5826feafdb9e15a1bc59066731e2.tar.xz
forgejo-df373c9f7ece5826feafdb9e15a1bc59066731e2.zip
Merge pull request '[gitea] week 2024-24 cherry pick (gitea/main -> forgejo)' (#4083) from earl-warren/wcp/2024-24 into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4083 Reviewed-by: twenty-panda <twenty-panda@noreply.codeberg.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 9 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 127da4d072..41b051cf9b 100644
--- a/Makefile
+++ b/Makefile
@@ -38,6 +38,7 @@ GO_LICENSES_PACKAGE ?= github.com/google/go-licenses@v1.6.0 # renovate: datasour
GOVULNCHECK_PACKAGE ?= golang.org/x/vuln/cmd/govulncheck@v1 # renovate: datasource=go
DEADCODE_PACKAGE ?= golang.org/x/tools/cmd/deadcode@v0.22.0 # renovate: datasource=go
GOMOCK_PACKAGE ?= go.uber.org/mock/mockgen@v0.4.0 # renovate: datasource=go
+GOPLS_PACKAGE ?= golang.org/x/tools/gopls@v0.15.3 # renovate: datasource=go
DOCKER_IMAGE ?= gitea/gitea
DOCKER_TAG ?= latest
@@ -228,6 +229,7 @@ help:
@echo " - lint-go lint go files"
@echo " - lint-go-fix lint go files and fix issues"
@echo " - lint-go-vet lint go files with vet"
+ @echo " - lint-go-gopls lint go files with gopls"
@echo " - lint-js lint js files"
@echo " - lint-js-fix lint js files and fix issues"
@echo " - lint-css lint css files"
@@ -468,6 +470,11 @@ lint-go-vet:
@echo "Running go vet..."
@$(GO) vet ./...
+.PHONY: lint-go-gopls
+lint-go-gopls:
+ @echo "Running gopls check..."
+ @GO=$(GO) GOPLS_PACKAGE=$(GOPLS_PACKAGE) tools/lint-go-gopls.sh $(GO_SOURCES_NO_BINDATA)
+
.PHONY: lint-editorconfig
lint-editorconfig:
$(GO) run $(EDITORCONFIG_CHECKER_PACKAGE) templates .forgejo/workflows
@@ -879,13 +886,14 @@ deps-tools:
$(GO) install $(GO_LICENSES_PACKAGE)
$(GO) install $(GOVULNCHECK_PACKAGE)
$(GO) install $(GOMOCK_PACKAGE)
+ $(GO) install $(GOPLS_PACKAGE)
node_modules: package-lock.json
npm install --no-save
@touch node_modules
.venv: poetry.lock
- poetry install --no-root
+ poetry install
@touch .venv
.PHONY: fomantic