chore: go1.22.0-rc1

golangci · Dec 19, 2023 · 20d85ec · 20d85ec
1 parent b2901be
commit 20d85ec
Show file tree

Hide file tree

Showing 12 changed files with 37 additions and 17 deletions.
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -11,7 +11,7 @@ jobs:
     name: Build and deploy documentation
     runs-on: ubuntu-latest
     env:
-      GO_VERSION: '1.21'
+      GO_VERSION: '1.22.0-rc.1'
       NODE_VERSION: '20.x'
       CGO_ENABLED: 0
 

diff --git a/.github/workflows/post-release.yml b/.github/workflows/post-release.yml
@@ -18,7 +18,7 @@ jobs:
           # ex:
           # - 1.18beta1 -> 1.18.0-beta.1
           # - 1.18rc1 -> 1.18.0-rc.1
-          go-version: '1.21'
+          go-version: '1.22.0-rc.1'
 
       - name: Update GitHub action config
         run: make assets/github-action-config.json

diff --git a/.github/workflows/pr-documentation.yml b/.github/workflows/pr-documentation.yml
@@ -9,7 +9,7 @@ jobs:
     name: Build documentation
     runs-on: ubuntu-latest
     env:
-      GO_VERSION: '1.21'
+      GO_VERSION: '1.22.0-rc.1'
       NODE_VERSION: '20.x'
       CGO_ENABLED: 0
 

diff --git a/.github/workflows/pr-extra.yml b/.github/workflows/pr-extra.yml
@@ -17,7 +17,7 @@ jobs:
           # ex:
           # - 1.18beta1 -> 1.18.0-beta.1
           # - 1.18rc1 -> 1.18.0-rc.1
-          go-version: '1.21'
+          go-version: '1.22.0-rc.1'
       - name: Run go list
         run: go list -json -m all > go.list
       - name: Nancy

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -6,7 +6,7 @@ on:
   pull_request:
 
 env:
-  GO_VERSION: '1.21'
+  GO_VERSION: '1.22.0-rc.1'
 
 jobs:
   # Check if there is any dirty change for go mod tidy
@@ -41,7 +41,9 @@ jobs:
           # ex:
           # - 1.18beta1 -> 1.18.0-beta.1
           # - 1.18rc1 -> 1.18.0-rc.1
-          go-version: ${{ env.GO_VERSION }}
+          # TODO(ldez) must be changed after the first release of golangci-lint with go1.22
+          # go-version: ${{ env.GO_VERSION }}
+          go-version: '1.21'
       - name: lint
         uses: golangci/golangci-lint-action@v3.7.0
         with:
@@ -88,8 +90,8 @@ jobs:
     strategy:
       matrix:
         golang:
-          - '1.20'
           - '1.21'
+          - '1.22.0-rc.1'
     steps:
       - uses: actions/checkout@v4
       - name: Install Go

diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml
@@ -16,7 +16,7 @@ jobs:
           # ex:
           # - 1.18beta1 -> 1.18.0-beta.1
           # - 1.18rc1 -> 1.18.0-rc.1
-          go-version: '1.21'
+          go-version: '1.22.0-rc.1'
       - name: Unshallow
         run: git fetch --prune --unshallow
 
@@ -46,7 +46,7 @@ jobs:
           # ex:
           # - 1.18beta1 -> 1.18.0-beta.1
           # - 1.18rc1 -> 1.18.0-rc.1
-          go-version: '1.21'
+          go-version: '1.22.0-rc.1'
 
       - name: Unshallow
         run: git fetch --prune --unshallow

diff --git a/build/Dockerfile b/build/Dockerfile
@@ -1,5 +1,5 @@
 # stage 1 building the code
-FROM golang:1.21 as builder
+FROM golang:1.22 as builder
 
 ARG VERSION
 ARG SHORT_COMMIT
@@ -10,7 +10,7 @@ WORKDIR /golangci
 RUN CGO_ENABLED=0 go build -trimpath -ldflags "-s -w -X main.version=$VERSION -X main.commit=$SHORT_COMMIT -X main.date=$DATE" -o golangci-lint ./cmd/golangci-lint/main.go
 
 # stage 2
-FROM golang:1.21
+FROM golang:1.22
 # related to https://github.com/golangci/golangci-lint/issues/3107
 ENV GOROOT /usr/local/go
 # Set all directories as safe

diff --git a/build/alpine.Dockerfile b/build/alpine.Dockerfile
@@ -1,5 +1,5 @@
 # stage 1 building the code
-FROM golang:1.21-alpine as builder
+FROM golang:1.22-alpine as builder
 
 ARG VERSION
 ARG SHORT_COMMIT
@@ -15,7 +15,7 @@ RUN apk --no-cache add gcc musl-dev git mercurial
 RUN CGO_ENABLED=0 go build -trimpath -ldflags "-s -w -X main.version=$VERSION -X main.commit=$SHORT_COMMIT -X main.date=$DATE" -o golangci-lint ./cmd/golangci-lint/main.go
 
 # stage 2
-FROM golang:1.21-alpine
+FROM golang:1.22-alpine
 # related to https://github.com/golangci/golangci-lint/issues/3107
 ENV GOROOT /usr/local/go
 # gcc is required to support cgo;

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/golangci/golangci-lint
 
-go 1.20
+go 1.21
 
 require (
 	4d63.com/gocheckcompilerdirectives v1.2.1

diff --git a/go.sum b/go.sum
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -41,13 +41,13 @@ type Version struct {
 	Debug  bool   `mapstructure:"debug"`
 }
 
-func IsGreaterThanOrEqualGo121(v string) bool {
+func IsGreaterThanOrEqualGo122(v string) bool {
 	v1, err := hcversion.NewVersion(strings.TrimPrefix(v, "go"))
 	if err != nil {
 		return false
 	}
 
-	limit, err := hcversion.NewVersion("1.21")
+	limit, err := hcversion.NewVersion("1.22")
 	if err != nil {
 		return false
 	}

diff --git a/pkg/lint/linter/config.go b/pkg/lint/linter/config.go
@@ -134,7 +134,7 @@ func (lc *Config) Name() string {
 }
 
 func (lc *Config) WithNoopFallback(cfg *config.Config) *Config {
-	if cfg != nil && config.IsGreaterThanOrEqualGo121(cfg.Run.Go) {
+	if cfg != nil && config.IsGreaterThanOrEqualGo122(cfg.Run.Go) {
 		lc.Linter = &Noop{
 			name: lc.Linter.Name(),
 			desc: lc.Linter.Desc(),