tools: moved to new go 1.24 approach using go get -tool and upgraded to golangci v2 (#1009)

Author: mvisonneau

.github/prerelease.sh

@@ -27,7 +27,7 @@ mkdir -p ${HOME}/.cache/snapcraft/{download,stage-packages}
 # Build the binaries using a prerelease tag
 git tag -d edge
 git tag -f ${PRERELEASE_TAG}
-goreleaser release \
+go tool github.com/goreleaser/goreleaser/v2 release \
     --clean \
     --skip=validate \
     -f .goreleaser.pre.yml

.github/workflows/release.yml

@@ -62,12 +62,6 @@ jobs:
           gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
           passphrase: ${{ secrets.GPG_PASSPHRASE }}
 
-      - name: Install goreleaser
-        uses: goreleaser/goreleaser-action@9c156ee8a17a598857849441385a2041ef570552 # v6
-        with:
-          version: v1.24.0
-          install-only: true
-
       - name: Run goreleaser
         run: make ${{ github.ref == 'refs/heads/main' && 'pre' || '' }}release
         env:

.golangci.yml

@@ -1,50 +1,53 @@
+---
+version: "2"
+
 linters:
-  enable-all: true
-  disable:
-    # Deprecated
-    - gomnd
-
-    # We don't want these ones
-    - forcetypeassert
-    - gochecknoglobals
-    - godox
-    - ireturn
-    - nakedret
-    - testpackage
-    - varnamelen
-    - interfacebloat
-    - wsl
-
-    # TODO
-    - tagliatelle
-    - promlinter
-    - paralleltest
-    - gocognit
-    - gomoddirectives
-    - forbidigo
-    - goconst
-    - mnd
-    - lll
-    - dupl
-    - depguard
-    - tagalign
-
-linters-settings:
-  funlen:
-    lines: -1 # (disabled)
-    statements: 100
-  
-  cyclop:
-    max-complexity: 20
-
-  lll:
-    line-length: 140
-  
-  nestif:
-    min-complexity: 18
-  
-  gci:
-    sections:
-      - standard
-      - default
-      - prefix(github.com/mvisonneau)
+  default: none
+  enable:
+    - errcheck
+    - gosec
+    - govet
+    - ineffassign
+    - staticcheck
+    - unused
+
+  settings:
+    funlen:
+      lines: -1 # (disabled)
+      statements: 100
+
+    cyclop:
+      max-complexity: 20
+
+    lll:
+      line-length: 140
+
+    nestif:
+      min-complexity: 18
+
+    gosec:
+      excludes:
+        # https://github.com/golangci/golangci-lint/discussions/4939
+        # Disabled by default in golangci because it's too noisy, too many false positives
+        - G115
+    staticcheck:
+      checks:
+        - all
+        # Seems buggy
+        - -ST1000
+        # Not personally fond of having to remove those embedded field calls.
+        - -QF1008
+
+formatters:
+  enable:
+    - gci
+    - gofmt
+    - gofumpt
+    - goimports
+
+  settings:
+    gci:
+      sections:
+        - standard
+        - default
+        - prefix(github.com/mvisonneau)

.goreleaser.pre.yml

@@ -1,3 +1,4 @@
+version: 2
 before:
   hooks:
     - make man-pages
@@ -19,6 +20,9 @@ builds:
     goarm: [6, 7]
     flags:
       - -trimpath
+    ignore:
+      - { goos: darwin, goarch: 386 }
+      - { goos: darwin, goarch: arm }
 
 universal_binaries:
   - {}
@@ -37,7 +41,7 @@ nfpms:
   - maintainer: &author Maxime VISONNEAU <maxime.visonneau@gmail.com>
     description: &description GitLab CI pipelines exporter (prometheus/open-metrics)
     license: &license Apache-2.0
-    homepage: &homepage https://github.com/mvisonneau/gitlab-ci-pipelines-exporter
+    homepage: https://github.com/mvisonneau/gitlab-ci-pipelines-exporter
     vendor: *author
     file_name_template: '{{ .ProjectName }}_edge_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}'
     bindir: /usr/local/bin
@@ -51,7 +55,7 @@ nfpms:
         file_info:
           mode: 0644
       - src: ./helpers/autocomplete/zsh
-        dst:  /usr/share/zsh/vendor-completions/_{{ .ProjectName }}
+        dst: /usr/share/zsh/vendor-completions/_{{ .ProjectName }}
         file_info:
           mode: 0644
       - src: ./helpers/manpages/{{ .ProjectName }}.1.gz
@@ -66,16 +70,14 @@ nfpms:
 release:
   disable: true
 
-# Disabling until https://github.com/canonical/snapcraft/issues/4769 is resolved
-#snapcrafts:
-#  - summary: GitLab CI pipelines exporter (prometheus/open-metrics)
-#    description: Monitor GitLab CI pipelines related metrics.
-#    license: Apache-2.0
-#    confinement: strict
-#    grade: devel
-#    apps:
-#      gitlab-ci-pipelines-exporter:
-#        plugs: [home, network, network-bind]
+snapcrafts:
+  - summary: *description
+    description: Monitor GitLab CI pipelines related metrics.
+    license: *license
+    grade: devel
+    apps:
+      gitlab-ci-pipelines-exporter:
+        plugs: [home, network, network-bind]
 
 dockers:
   - image_templates:

.goreleaser.yml

@@ -1,3 +1,4 @@
+version: 2
 before:
   hooks:
     - make man-pages
@@ -19,6 +20,9 @@ builds:
     goarm: [6, 7]
     flags:
       - -trimpath
+    ignore:
+      - { goos: darwin, goarch: 386 }
+      - { goos: darwin, goarch: arm }
 
 universal_binaries:
   - {}
@@ -51,7 +55,7 @@ nfpms:
         file_info:
           mode: 0644
       - src: ./helpers/autocomplete/zsh
-        dst:  /usr/share/zsh/vendor-completions/_{{ .ProjectName }}
+        dst: /usr/share/zsh/vendor-completions/_{{ .ProjectName }}
         file_info:
           mode: 0644
       - src: ./helpers/manpages/{{ .ProjectName }}.1.gz
@@ -67,7 +71,7 @@ brews:
   - description: *description
     homepage: *homepage
     license: *license
-    folder: Formula
+    directory: Formula
     repository:
       owner: mvisonneau
       name: homebrew-tap
@@ -87,15 +91,14 @@ scoops:
       owner: mvisonneau
       name: scoops
 
-# Disabling until https://github.com/canonical/snapcraft/issues/4769 is resolved
-#snapcrafts:
-#  - summary: *description
-#    description: Monitor GitLab CI pipelines related metrics.
-#    license: *license
-#    grade: stable
-#    apps:
-#      gitlab-ci-pipelines-exporter:
-#        plugs: [home, network, network-bind]
+snapcrafts:
+  - summary: *description
+    description: Monitor GitLab CI pipelines related metrics.
+    license: *license
+    grade: stable
+    apps:
+      gitlab-ci-pipelines-exporter:
+        plugs: [home, network, network-bind]
 
 dockers:
   - image_templates:

Makefile

@@ -3,16 +3,18 @@ FILES          := $(shell git ls-files */*.go)
 COVERAGE_FILE  := coverage.out
 REPOSITORY     := mvisonneau/$(NAME)
 .DEFAULT_GOAL  := help
-GOLANG_VERSION := 1.23
+
+GOLANG_VERSION := 1.24
+GOLANGCI_LINT := go tool github.com/golangci/golangci-lint/v2/cmd/golangci-lint
+GORELEASER    := go tool github.com/goreleaser/goreleaser/v2
 
 .PHONY: fmt
 fmt: ## Format source code
-	go run mvdan.cc/gofumpt@v0.8.0 -w $(shell git ls-files **/*.go)
-	go run github.com/daixiang0/gci@v0.13.6 write -s standard -s default -s "prefix(github.com/mvisonneau)" .
+	$(GOLANGCI_LINT) fmt -v
 
 .PHONY: lint
 lint: ## Run all lint related tests upon the codebase
-	go run github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.8 run -v --fast
+	$(GOLANGCI_LINT) run -v
 
 .PHONY: test
 test: ## Run the tests against the codebase
@@ -29,15 +31,15 @@ install: ## Build and install locally the binary (dev purpose)
 	go install ./cmd/$(NAME)
 
 .PHONY: build
-build: ## Build the binaries using local GOOS
-	go build ./cmd/$(NAME)
+build: ## Build the binaries
+	$(GORELEASER) build --clean --snapshot
 
 .PHONY: release
 release: ## Build & release the binaries (stable)
 	mkdir -p ${HOME}/.cache/snapcraft/download
 	mkdir -p ${HOME}/.cache/snapcraft/stage-packages
 	git tag -d edge
-	goreleaser release --clean
+	$(GORELEASER) release --clean
 	find dist -type f -name "*.snap" -exec snapcraft upload --release stable,edge '{}' \;
 
 .PHONY: protoc