Fix goreleaser version (#667)

The release github action is currently broken:

We were using the `latest` gorelease-action, which had changed from 1->2 recently. The main breaking change for us was that `--rm-dist` flag was replaced by `--clean`

But this change causes some other changes:
- Some smaller changes in the goreleaser config
- To run the newest goreleaser, we have to upgrade to golang 1.23.0
- When using go 1.23.0, golangci-lint also needs upgrading
- golanci-lint on the new version also has some config deprecations/changes 

But with all these changes, the local build/lint runs without errors or warnings and the dry-run gorelease also runs through (hopefully the same is the case in the github action).

Author: gigerdo

.github/workflows/branch.yml

@@ -31,7 +31,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.20"
+          go-version: "1.23"
         id: go
 
       - name: Bump patch version
@@ -60,7 +60,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.20"
+          go-version: "1.23"
         id: go
 
       - name: Bump main version

.github/workflows/go.yml

@@ -10,7 +10,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v5
       with:
-        go-version: "1.20"
+        go-version: "1.23"
       id: go
 
     - name: Check out code into the Go module directory

.github/workflows/release.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.20"
+          go-version: "1.23"
         id: go
 
       - name: Cache Go Modules
@@ -62,8 +62,8 @@ jobs:
           OWNER: elastic
           REPO: ecctl
         with:
-          version: latest
-          args: release --rm-dist
+          version: '~> v2'
+          args: release --clean
 
       - name: Run release post actions
         run: ./scripts/goreleaser-post-actions.sh $VERSION

.gitignore

@@ -3,4 +3,5 @@ vendor
 dist
 reports
 .idea/
-html_docs/
+html_docs/
+ecctl.iml

.golangci.yml

@@ -4,14 +4,21 @@ linters:
     - lll
     - gochecknoglobals
     - gochecknoinits
-    - scopelint
     - funlen
     - wsl
     - gomnd
 
 linters-settings:
   errcheck:
-    exclude: build/errcheck-exclusions.txt
+    exclude-functions:
+      - (*github.com/spf13/cobra.Command).MarkFlagRequired
+      - (*github.com/spf13/cobra.Command).MarkFlagFilename
+      - github.com/spf13/cobra.MarkFlagRequired
+      - github.com/spf13/cobra.MarkFlagFilename
+      - github.com/spf13/cobra.MarkFlagFilename
+      - (*github.com/spf13/cobra.Command).Help
+      - (*github.com/spf13/viper.Viper).BindPFlags
+      - (*github.com/spf13/pflag.FlagSet).MarkHidden
   govet:
     check-shadowing: false
 
@@ -64,4 +71,6 @@ issues:
 
 
 output:
-  format: tab
+  formats:
+    - format: tab
+      path: stderr

.goreleaser.yml

@@ -1,3 +1,4 @@
+version: 2
 project_name: ecctl
 before:
   hooks:
@@ -34,7 +35,7 @@ archives:
     - README*
     - docs/*
 snapshot:
-  name_template: "{{ .Version }}_SNAPSHOT_{{ .ShortCommit }}"
+  version_template: "{{ .Version }}_SNAPSHOT_{{ .ShortCommit }}"
 nfpms:
   - file_name_template: >-
       {{ .ProjectName }}_{{ .Version }}_{{ .Os }}_

build/Makefile.build

@@ -56,4 +56,4 @@ changelog:
 
 ## Generates a snapshot of the potential release
 snapshot: deps
-	@ $(GOBIN)/goreleaser release --rm-dist --snapshot --skip-validate
+	@ $(GOBIN)/goreleaser release --clean --snapshot --skip-validate

build/Makefile.deps

@@ -6,12 +6,12 @@ VERSION_DIR:=$(GOBIN)/versions
 
 VERSION_GOLICENSER:=v0.4.1
 VERSION_GOLICENCEDETECTOR:=v0.6.0
-VERSION_GOLANGCILINT:=v1.54.2
+VERSION_GOLANGCILINT:=v1.61.0
 VERSION_GOBINDATA:=v0.0.0-20190711162640-ee3c2418e368
-VERSION_GORELEASER:=v1.21.2
+VERSION_GORELEASER:=v2.3.2
 VERSION_VERSIONBUMP:=v1.1.0
 
-deps: $(GOBIN)/go-licenser $(GOBIN)/go-licence-detector $(GOBIN)/golangci-lint $(GOBIN)/go-bindata
+deps: $(GOBIN)/go-licenser $(GOBIN)/go-licence-detector $(GOBIN)/golangci-lint $(GOBIN)/go-bindata $(GOBIN)/goreleaser
 
 $(GOBIN):
 	@ mkdir -p $(GOBIN)
@@ -57,7 +57,7 @@ $(VERSION_DIR)/.version-goreleaser-$(VERSION_GORELEASER): | $(VERSION_DIR)
 
 $(GOBIN)/goreleaser: $(VERSION_DIR)/.version-goreleaser-$(VERSION_GORELEASER) | $(GOBIN)
 	@ echo "-> Installing goreleaser..."
-	@ go install github.com/goreleaser/goreleaser@$(VERSION_GORELEASER)
+	@ go install github.com/goreleaser/goreleaser/v2@$(VERSION_GORELEASER)
 
 $(VERSION_DIR)/.version-versionbump-$(VERSION_VERSIONBUMP): | $(VERSION_DIR)
 	@ rm -f $(VERSION_DIR)/.version-versionbump-*

build/Makefile.dev

@@ -43,7 +43,7 @@ _bindata:
 format: deps
 	@ echo "-> Formatting Go files..."
 	@ $(GOBIN)/go-licenser -license ASL2
-	@ $(GOBIN)/golangci-lint run --fix --deadline=5m
+	@ $(GOBIN)/golangci-lint run --fix --timeout 5m
 	@ echo "-> Done."
 
 ## Generates the notice file
@@ -55,7 +55,7 @@ notice: deps
 .PHONY: lint
 lint: deps
 	@ echo "-> Running linters..."
-	@ $(GOBIN)/golangci-lint run --deadline=5m
+	@ $(GOBIN)/golangci-lint run --timeout 5m
 	@ $(GOBIN)/go-licenser -d .
 	@ echo "-> Done."