transfer

.github/workflows/release.yml

@@ -29,7 +29,7 @@ jobs:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
 
-    - uses: docker/build-push-action@v5
+    - uses: docker/build-push-action@v6
       with:
         context: .
         push: ${{ github.event_name != 'pull_request' }}

.gitignore

@@ -1,12 +1,11 @@
-# If you prefer the allow list template instead of the deny list, see community template:
-# https://github.com/github/gitignore/blob/main/community/Golang/Go.AllowList.gitignore
-#
 # Binaries for programs and plugins
 *.exe
 *.exe~
 *.dll
 *.so
 *.dylib
+bin/*
+Dockerfile.cross
 
 # Test binary, built with `go test -c`
 *.test

Makefile

@@ -1,19 +1,76 @@
-GOLANGCI_LINT_VER := v1.59.1
-
-.PHONY: lint
-lint:
-	go install -v github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_LINT_VER) || true
-	golangci-lint run
+IMG ?= ghcr.io/kuoss/custom-error-pages:development
+COVERAGE_THRESHOLD = 80
 
 .PHONY: test
 test:
 	go test --failfast ./...
 
+#### checks
+.PHONY: checks
+checks: cover lint vulncheck build docker-build
+
 .PHONY: cover
-cover:
-	go test -coverprofile=cover.out ./...
-	go tool cover -func=cover.out
+cover: test
+	@echo "Running tests and checking coverage..."
+	@go test -coverprofile=coverage.out ./...
+	@go tool cover -func=coverage.out | grep total | awk '{print $$3}' | sed 's/%//' | \
+	awk -v threshold=$(COVERAGE_THRESHOLD) '{ if ($$1 < threshold) { print "Coverage is below threshold: " $$1 "% < " threshold "%"; exit 1 } else { print "Coverage is sufficient: " $$1 "% (>=" threshold "%)" } }'
+
+.PHONY: lint
+lint: golangci-lint
+	$(GOLANGCI_LINT) run
+
+.PHONY: vulncheck
+vulncheck: govulncheck
+	$(GOVULNCHECK) ./...
+
+## build
+.PHONY: build
+build:
+	go build -o bin/custom-error-pages .
+
+.PHONY: docker-build
+docker-build:
+	docker build -t $(IMG) .
+
+
+##@ Dependencies
+
+## Location to install dependencies to
+LOCALBIN ?= $(shell pwd)/bin
+$(LOCALBIN):
+	mkdir -p $(LOCALBIN)
+
+## Tool Binaries
+GOLANGCI_LINT ?= $(LOCALBIN)/golangci-lint
+GOVULNCHECK ?= $(LOCALBIN)/govulncheck
+
+## Tool Versions
+GOLANGCI_LINT_VERSION ?= v1.60.2
+GOVULNCHECK_VERSION ?= latest
+
+.PHONY: golangci-lint
+golangci-lint: $(GOLANGCI_LINT)
+$(GOLANGCI_LINT): $(LOCALBIN)
+	$(call go-install-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/cmd/golangci-lint,$(GOLANGCI_LINT_VERSION))
+
+.PHONY: govulncheck
+govulncheck: $(GOVULNCHECK)
+$(GOVULNCHECK): $(LOCALBIN)
+	$(call go-install-tool,$(GOVULNCHECK),golang.org/x/vuln/cmd/govulncheck,$(GOVULNCHECK_VERSION))
 
-.PHONY: docker
-docker:
-	docker build -t custom-error-pages .
+# go-install-tool will 'go install' any package with custom target and name of binary, if it doesn't exist
+# $1 - target path with name of binary
+# $2 - package url which can be installed
+# $3 - specific version of package
+define go-install-tool
+@[ -f "$(1)-$(3)" ] || { \
+set -e; \
+package=$(2)@$(3) ;\
+echo "Downloading $${package}" ;\
+rm -f $(1) || true ;\
+GOBIN=$(LOCALBIN) go install $${package} ;\
+mv $(1) $(1)-$(3) ;\
+} ;\
+ln -sf $(1)-$(3) $(1)
+endef