From b8445c951f70fa55eda8d061abc430fe1dedc1c6 Mon Sep 17 00:00:00 2001 From: cpmachado Date: Wed, 1 Oct 2025 23:15:55 +0100 Subject: [PATCH 1/3] Complete refactor Makefile --- Makefile | 44 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index ccda2b5..ec8459e 100644 --- a/Makefile +++ b/Makefile @@ -1,16 +1,46 @@ +MAIN=. +TAG_VERSION=$(shell git describe --tags --exact-match 2>/dev/null || git rev-parse --short HEAD || echo "were-init") +VERSION=$(subst /,_,$(TAG_VERSION)) + +all: build + @echo all built + build: - go build + go build $(MAIN) clean: - go clean + @rm -rf gelo target + @echo all removed lint: - golangci-lint run . + golangci-lint run ./... + @echo all code is linted + +format: + gofmt -w -s . + +format-check: + gofmt -l . run: - go run . $(OTHER) + go run $(MAIN) -loglevel DEBUG + +test: + go test -v ./... + +sbom: build + @mkdir -p target/sbom + cyclonedx-gomod bin -json -output ./target/sbom/gelo-$(VERSION).bom.json ./gelo + +setup-devtools: + # Vulnerability checker + go install golang.org/x/vuln/cmd/govulncheck@latest + # Debugger + go install github.com/go-delve/delve/cmd/dlv@latest + # Linter + go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest + # SBOM generator + go install github.com/CycloneDX/cyclonedx-gomod/cmd/cyclonedx-gomod@latest -setup: - go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.63.4 -.PHONY: build clean lint run setup +.PHONY: all build clean dev-dependencies lint format format-check run test sbom setup-devtools From fabf6872df49fcbde34280bbe4f4296618d0bcef Mon Sep 17 00:00:00 2001 From: cpmachado Date: Wed, 1 Oct 2025 23:16:16 +0100 Subject: [PATCH 2/3] Update go version in go.mod --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 6ec4a93..ff8e90c 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,3 @@ module go.cpmachado.pt/gelo -go 1.24.0 +go 1.25.1 From 1a10157b29353f29f69f44824692c25257071db0 Mon Sep 17 00:00:00 2001 From: cpmachado Date: Wed, 1 Oct 2025 23:16:37 +0100 Subject: [PATCH 3/3] Update version of go in action --- .github/workflows/go.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index e26c2bb..a764203 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -10,7 +10,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: '1.24' + go-version: '1.25' - name: Check outdated dependencies run: go mod tidy -diff @@ -21,7 +21,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: '1.24' + go-version: '1.25' - name: Install govulncheck run: go install golang.org/x/vuln/cmd/govulncheck@latest - name: Check vulnerabilities @@ -34,7 +34,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: '1.24' + go-version: '1.25' - name: Check format according to gofmt run: test -z $(gofmt -l .) @@ -45,6 +45,6 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: '1.24' + go-version: '1.25' - name: Test run: go test -v ./...