From 0cfab84c081accdb037609bf87a9b284fd078e17 Mon Sep 17 00:00:00 2001 From: Martin Veldwijk Date: Fri, 28 Jul 2023 09:38:05 +0200 Subject: [PATCH 1/7] simple fix for go tools Signed-off-by: Martin Veldwijk --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 58ce385..784ca34 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ export CGO_ENABLED=0 GO ?= go SHASUM ?= shasum -a 256 -export PATH := $($(GO) env GOPATH)/bin:$(PATH) +export PATH := $(shell $(GO) env GOPATH)/bin:$(PATH) GOFILES := $(shell find . -name "*.go" -type f ! -path "*/bindata.go") GOFMT ?= gofmt -s -- 2.40.1 From 836dd726e716b7078d4f8b17a9328b877ceeefda Mon Sep 17 00:00:00 2001 From: Martin Veldwijk Date: Fri, 28 Jul 2023 09:38:05 +0200 Subject: [PATCH 2/7] simple fix for go tools Signed-off-by: Martin Veldwijk --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 784ca34..131b9cd 100644 --- a/Makefile +++ b/Makefile @@ -65,15 +65,15 @@ vet: .PHONY: lint lint: install-lint-tools - revive -config .revive.toml ./... || exit 1 + $(GO) run revive@latest -config .revive.toml ./... || exit 1 .PHONY: misspell-check misspell-check: install-lint-tools - misspell -error -i unknwon,destory $(GOFILES) + $(GO) run misspell@latest -error -i unknwon,destory $(GOFILES) .PHONY: misspell misspell: install-lint-tools - misspell -w -i unknwon $(GOFILES) + $(GO) run misspell@latest -w -i unknwon $(GOFILES) .PHONY: fmt-check fmt-check: @@ -103,7 +103,7 @@ check: test .PHONY: install install: $(SOURCES) @echo "installing to $(shell $(GO) env GOPATH)/bin/$(EXECUTABLE)" - $(GO) install -v $(BUILDMODE) $(GOFLAGS) + $(GO) install -v $(BUILDMODE) $(GOFLAGS) .PHONY: build build: $(EXECUTABLE) -- 2.40.1 From a1a0a213d7013b39e164b6cd3ecda3467016180c Mon Sep 17 00:00:00 2001 From: Martin Veldwijk Date: Mon, 21 Aug 2023 08:41:44 +0200 Subject: [PATCH 3/7] Remove shell offloading as requested --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 131b9cd..62283b1 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ export CGO_ENABLED=0 GO ?= go SHASUM ?= shasum -a 256 -export PATH := $(shell $(GO) env GOPATH)/bin:$(PATH) +export PATH := $($(GO) env GOPATH)/bin:$(PATH) GOFILES := $(shell find . -name "*.go" -type f ! -path "*/bindata.go") GOFMT ?= gofmt -s -- 2.40.1 From 319ef2f07072e3bf608f18c903c1463df772d219 Mon Sep 17 00:00:00 2001 From: Martin Veldwijk Date: Mon, 21 Aug 2023 08:51:38 +0200 Subject: [PATCH 4/7] attempt to fix module path error Signed-off-by: Martin Veldwijk --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 62283b1..b28ab95 100644 --- a/Makefile +++ b/Makefile @@ -65,7 +65,7 @@ vet: .PHONY: lint lint: install-lint-tools - $(GO) run revive@latest -config .revive.toml ./... || exit 1 + $(GO) run github.com/mgechev/revive@latest -config .revive.toml ./... || exit 1 .PHONY: misspell-check misspell-check: install-lint-tools @@ -73,7 +73,7 @@ misspell-check: install-lint-tools .PHONY: misspell misspell: install-lint-tools - $(GO) run misspell@latest -w -i unknwon $(GOFILES) + $(GO) run github.com/client9/misspell@latest -w -i unknwon $(GOFILES) .PHONY: fmt-check fmt-check: @@ -124,11 +124,11 @@ release-dirs: .PHONY: release-os release-os: - CGO_ENABLED=0 gox -verbose -cgo=false $(GOFLAGS) -osarch='!darwin/386 !darwin/arm' -os="windows linux darwin" -arch="386 amd64 arm arm64" -output="$(DIST)/release/tea-$(VERSION)-{{.OS}}-{{.Arch}}" + CGO_ENABLED=0 $(GO) run github.com/mitchellh/gox@latest -verbose -cgo=false $(GOFLAGS) -osarch='!darwin/386 !darwin/arm' -os="windows linux darwin" -arch="386 amd64 arm arm64" -output="$(DIST)/release/tea-$(VERSION)-{{.OS}}-{{.Arch}}" .PHONY: release-compress release-compress: install-release-tools - cd $(DIST)/release/; for file in `find . -type f -name "*"`; do echo "compressing $${file}" && gxz -k -9 $${file}; done; + cd $(DIST)/release/; for file in `find . -type f -name "*"`; do echo "compressing $${file}" && $(GO) run github.com/ulikunitz/xz/cmd/gxz@latest -k -9 $${file}; done; .PHONY: release-check release-check: install-release-tools -- 2.40.1 From 299be090a065366315bb8c8ee7aa7b540305ad4b Mon Sep 17 00:00:00 2001 From: Martin Veldwijk Date: Mon, 21 Aug 2023 09:17:50 +0200 Subject: [PATCH 5/7] Accidentally broke checking for gitea-vet without extension Signed-off-by: Martin Veldwijk --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9ebe256..1dc5a9f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ tea -/gitea-vet[.exe] +/gitea-vet +/gitea-vet.exe .idea/ .history/ -- 2.40.1 From 273f848277cd972eca9a725004b158e291e48032 Mon Sep 17 00:00:00 2001 From: Martin Veldwijk Date: Mon, 21 Aug 2023 09:22:23 +0200 Subject: [PATCH 6/7] Forgot one misspell call Signed-off-by: Martin Veldwijk --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6356665..2e2a0dd 100644 --- a/Makefile +++ b/Makefile @@ -71,7 +71,7 @@ lint: install-lint-tools .PHONY: misspell-check misspell-check: install-lint-tools - $(GO) run misspell@latest -error -i unknwon,destory $(GOFILES) + $(GO) run github.com/client9/misspell@latest -error -i unknwon,destory $(GOFILES) .PHONY: misspell misspell: install-lint-tools -- 2.40.1 From c7901b5c6fa83fe3517da312e8614f018e4b7a83 Mon Sep 17 00:00:00 2001 From: Martin Veldwijk Date: Mon, 21 Aug 2023 09:25:37 +0200 Subject: [PATCH 7/7] Missed a section for the package Signed-off-by: Martin Veldwijk --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2e2a0dd..689d13e 100644 --- a/Makefile +++ b/Makefile @@ -71,11 +71,11 @@ lint: install-lint-tools .PHONY: misspell-check misspell-check: install-lint-tools - $(GO) run github.com/client9/misspell@latest -error -i unknwon,destory $(GOFILES) + $(GO) run github.com/client9/misspell/cmd/misspell@latest -error -i unknwon,destory $(GOFILES) .PHONY: misspell misspell: install-lint-tools - $(GO) run github.com/client9/misspell@latest -w -i unknwon $(GOFILES) + $(GO) run github.com/client9/misspell/cmd/misspell@latest -w -i unknwon $(GOFILES) .PHONY: fmt-check fmt-check: -- 2.40.1