Merge pull request #7 from roman-kiselenko/upgrade-linter-ci

Upgrade linter to v2 and add to CI

Author: roman-kiselenko

.github/workflows/test.yml

@@ -3,7 +3,7 @@ name: "CI"
 on: [push, pull_request]
 jobs:
   build:
-    name: Build and Test
+    name: Build Lint Test
     runs-on: ubuntu-latest
     steps:
 
@@ -21,8 +21,11 @@ jobs:
       - name: Build
         run: make build
 
+      - name: Lint
+        run: make lint
+
       - name: Config
         run: make config
 
       - name: Test
-        run: make integration-test
+        run: make integration-test

.golangci.yml

@@ -1,7 +1,7 @@
+version: "2"
 run:
-  skip-dirs:
-    - (^|/)bin($|/)
-    - (^|/)tmp($|/)
+  allow-parallel-runners: true
+  relative-path-mode: wd
 linters:
   enable:
     - asciicheck
@@ -14,67 +14,89 @@ linters:
     - goconst
     - gocritic
     - gocyclo
-    - revive
     - gosec
     - lll
     - misspell
     - nakedret
     - noctx
     - prealloc
+    - revive
     - rowserrcheck
-    - exportloopref
-    - stylecheck
+    - staticcheck
     - unconvert
     - unparam
     - whitespace
+  settings:
+    funlen:
+      lines: 168
+      statements: 50
+    gocritic:
+      disabled-checks:
+        - singleCaseSwitch
+    lll:
+      line-length: 193
+      tab-width: 1
+    staticcheck:
+      checks:
+        - -S1023
+        - all
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      - linters:
+          - bodyclose
+          - dupl
+          - funlen
+          - gochecknoinits
+          - gocognit
+          - goconst
+          - gocyclo
+          - gosec
+          - lll
+          - maligned
+          - noctx
+          - revive
+          - scopelint
+          - staticcheck
+        path: _test.go
+      - linters:
+          - bodyclose
+          - dupl
+          - funlen
+          - gochecknoinits
+          - gocognit
+          - goconst
+          - gocyclo
+          - lll
+          - maligned
+          - noctx
+          - revive
+          - scopelint
+          - staticcheck
+        path: _mock.go
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+output:
+  formats:
+    tab:
+      path: stdout
+      colors: true
+formatters:
+  enable:
     - gofumpt
-linters-settings:
-  lll:
-    line-length: 193
-    tab-width: 1
-  funlen:
-    lines: 168
-    statements: 50
-  gocritic:
-    disabled-checks:
-      - singleCaseSwitch
-  golint:
-    min-confidence: 0.6
-  gosimple:
-    checks: ["all","-S1023"]
-  gofumpt:
-    module-path: smolgit
-    lang-version: "1.22.4"
-issues:
-  exclude-rules:
-    - path: _test.go
-      linters:
-        - funlen
-        - maligned
-        - noctx
-        - scopelint
-        - bodyclose
-        - lll
-        - goconst
-        - gocognit
-        - gocyclo
-        - gochecknoinits
-        - dupl
-        - staticcheck
-        - revive
-        - gosec
-    - path: _mock.go
-      linters:
-        - funlen
-        - maligned
-        - noctx
-        - scopelint
-        - bodyclose
-        - lll
-        - goconst
-        - gocognit
-        - gocyclo
-        - gochecknoinits
-        - dupl
-        - staticcheck
-        - revive
+  settings:
+    gofumpt:
+      module-path: smolgit
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

Makefile

@@ -8,9 +8,10 @@ WHITE  := $(shell tput -Txterm setaf 7)
 CYAN   := $(shell tput -Txterm setaf 6)
 RESET  := $(shell tput -Txterm sgr0)
 
-.PHONY: all test build clean run
-
 PROJECT_NAME := smolgit
+LINTER_BIN ?= golangci-lint
+
+.PHONY: all test build clean run lint /bin/$(LINTER_BIN)
 
 all: help
 
@@ -21,10 +22,17 @@ build: ## Build all the binaries and put the output in bin/
 build-docker: ## Build an image
 	docker build -t $(PROJECT_NAME) .
 
+bin/$(LINTER_BIN):
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b ./bin v2.1.1
+
 ## Clean:
 clean: ## Remove build related file
 	@-rm -fr ./bin
 
+## Lint:
+lint: ./bin/$(LINTER_BIN) ## Lint sources with golangci-lint
+	./bin/$(LINTER_BIN) run
+
 ## Run:
 run: clean build ## Run the smolgit `make run`
 	./bin/$(PROJECT_NAME) $(ARGS)
@@ -55,4 +63,4 @@ help: ## Show this help.
 	@awk 'BEGIN {FS = ":.*?## "} { \
 		if (/^[a-zA-Z_-]+:.*?##.*$$/) {printf "    ${YELLOW}%-20s${GREEN}%s${RESET}\n", $$1, $$2} \
 		else if (/^## .*$$/) {printf "  ${CYAN}%s${RESET}\n", substr($$1,4)} \
-		}' $(MAKEFILE_LIST)
+		}' $(MAKEFILE_LIST)

go.mod

@@ -1,6 +1,8 @@
 module smolgit
 
-go 1.22.4
+go 1.23.0
+
+toolchain go1.24.2
 
 require (
 	github.com/gin-gonic/gin v1.10.0
@@ -12,7 +14,7 @@ require (
 	github.com/knadh/koanf/providers/file v1.0.0
 	github.com/knadh/koanf/v2 v2.1.1
 	github.com/lmittmann/tint v1.0.4
-	golang.org/x/crypto v0.23.0
+	golang.org/x/crypto v0.37.0
 )
 
 require (
@@ -34,9 +36,10 @@ require (
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/go-playground/validator/v10 v10.20.0 // indirect
-	github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect
+	github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/kevinburke/ssh_config v1.2.0 // indirect
@@ -48,20 +51,24 @@ require (
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
+	github.com/onsi/gomega v1.36.3 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.4 // indirect
 	github.com/pjbgf/sha1cd v0.3.0 // indirect
+	github.com/rogpeppe/go-internal v1.14.1 // indirect
 	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
 	github.com/skeema/knownhosts v1.2.2 // indirect
+	github.com/stretchr/testify v1.10.0 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.12 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
 	golang.org/x/arch v0.8.0 // indirect
-	golang.org/x/mod v0.12.0 // indirect
-	golang.org/x/net v0.25.0 // indirect
-	golang.org/x/sys v0.21.0 // indirect
-	golang.org/x/text v0.15.0 // indirect
-	golang.org/x/tools v0.13.0 // indirect
-	google.golang.org/protobuf v1.34.1 // indirect
+	golang.org/x/mod v0.24.0 // indirect
+	golang.org/x/net v0.39.0 // indirect
+	golang.org/x/sync v0.13.0 // indirect
+	golang.org/x/sys v0.32.0 // indirect
+	golang.org/x/text v0.24.0 // indirect
+	golang.org/x/tools v0.32.0 // indirect
+	google.golang.org/protobuf v1.36.6 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )