chore: go1.23.0-rc1

golangci · Jun 21, 2024 · dac86a0 · dac86a0
1 parent 304e22a
commit dac86a0
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 20 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.22'
+ GO_VERSION: '1.23.0-rc.1'
  NODE_VERSION: '20.x'
  CGO_ENABLED: 0
 

diff --git a/.github/workflows/post-release.yml b/.github/workflows/post-release.yml
@@ -20,7 +20,7 @@ jobs:
  # ex:
  # - 1.18beta1 -> 1.18.0-beta.1
  # - 1.18rc1 -> 1.18.0-rc.1
- go-version: '1.22'
+ go-version: '1.23.0-rc.1'
  - uses: actions/setup-node@v4
  with:
  node-version: "15"
@@ -56,7 +56,7 @@ jobs:
  # ex:
  # - 1.18beta1 -> 1.18.0-beta.1
  # - 1.18rc1 -> 1.18.0-rc.1
- go-version: '1.22'
+ go-version: '1.23.0-rc.1'
 
  - name: Update GitHub Action config
  run: make assets/github-action-config.json
@@ -84,7 +84,7 @@ jobs:
  # ex:
  # - 1.18beta1 -> 1.18.0-beta.1
  # - 1.18rc1 -> 1.18.0-rc.1
- go-version: '1.22'
+ go-version: '1.23.0-rc.1'
 
  - name: Update reference files
  run: cp .golangci.next.reference.yml .golangci.reference.yml

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.22'
+ GO_VERSION: '1.23.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.22'
+ go-version: '1.23.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.22'
+ GO_VERSION: '1.23.0-rc.1'
 
 jobs:
  # Check if there is any dirty change for go mod tidy
@@ -42,7 +42,7 @@ jobs:
  # ex:
  # - 1.18beta1 -> 1.18.0-beta.1
  # - 1.18rc1 -> 1.18.0-rc.1
- go-version: ${{ env.GO_VERSION }}
+ go-version: '1.22'
  - name: lint
  uses: golangci/[email protected]
  with:
@@ -86,8 +86,8 @@ jobs:
  strategy:
  matrix:
  golang:
- - '1.21'
  - '1.22'
+ - '1.23.0-rc.1'
  steps:
  - uses: actions/checkout@v4
  - name: Install Go

diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml
@@ -12,7 +12,7 @@ jobs:
  # ex:
  # - 1.18beta1 -> 1.18.0-beta.1
  # - 1.18rc1 -> 1.18.0-rc.1
- GO_VERSION: '1.22'
+ GO_VERSION: '1.23.0-rc.1'
  CHOCOLATEY_VERSION: 2.2.0
  steps:
  - uses: actions/checkout@v4

diff --git a/build/buildx-alpine.Dockerfile b/build/buildx-alpine.Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1.4
-FROM golang:1.22-alpine
+FROM golang:1.23-alpine
 
 # related to https://github.com/golangci/golangci-lint/issues/3107
 ENV GOROOT /usr/local/go

diff --git a/build/buildx.Dockerfile b/build/buildx.Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1.4
-FROM golang:1.22
+FROM golang:1.23
 
 # related to https://github.com/golangci/golangci-lint/issues/3107
 ENV GOROOT /usr/local/go

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

diff --git a/pkg/golinters/govet/govet.go b/pkg/golinters/govet/govet.go
@@ -179,8 +179,7 @@ func analyzersFromConfig(settings *config.GovetSettings) []*analysis.Analyzer {
 }
 
 func isAnalyzerEnabled(name string, cfg *config.GovetSettings, defaultAnalyzers []*analysis.Analyzer) bool {
- // TODO(ldez) remove loopclosure when go1.23
- if name == loopclosure.Analyzer.Name && config.IsGoGreaterThanOrEqual(cfg.Go, "1.22") {
+ if name == loopclosure.Analyzer.Name {
  return false
  }
 

diff --git a/pkg/golinters/govet/govet_test.go b/pkg/golinters/govet/govet_test.go
@@ -84,7 +84,6 @@ func TestGovetAnalyzerIsEnabled(t *testing.T) {
  {Name: "unsafeptr", Enabled: true, Enable: []string{"unsafeptr"}},
  {Name: "shift", Enabled: true, EnableAll: true},
  {Name: "shadow", EnableAll: true, Disable: []string{"shadow"}, Enabled: false},
- {Name: "loopclosure", EnableAll: true, Enabled: false, Go: "1.22"}, // TODO(ldez) remove loopclosure when go1.23
  } {
  cfg := &config.GovetSettings{
  Enable: tc.Enable,

diff --git a/test/run_test.go b/test/run_test.go
@@ -101,7 +101,6 @@ func TestCgoOk(t *testing.T) {
  WithArgs("--timeout=3m",
  "--enable-all",
  ).
- WithArgs("--go=1.22"). // TODO(ldez) remove this line when we will run go1.23 on the CI. (related to intrange, copyloopvar)
  WithTargetPath(testdataDir, "cgo").
  Runner().
  Install().
@@ -323,7 +322,6 @@ func TestUnsafeOk(t *testing.T) {
  testshared.NewRunnerBuilder(t).
  WithNoConfig().
  WithArgs("--enable-all").
- WithArgs("--go=1.22"). // TODO(ldez) remove this line when we will run go1.23 on the CI. (related to intrange, copyloopvar)
  WithTargetPath(testdataDir, "unsafe").
  Runner().
  Install().
@@ -484,7 +482,6 @@ func TestEnableAllFastAndEnableCanCoexist(t *testing.T) {
  testshared.NewRunnerBuilder(t).
  WithNoConfig().
  WithArgs(test.args...).
- WithArgs("--go=1.22"). // TODO(ldez) remove this line when we will run go1.23 on the CI. (related to intrange, copyloopvar)
  WithTargetPath(testdataDir, minimalPkg).
  WithBinPath(binPath).
  Runner().

diff --git a/test/testshared/integration/run.go b/test/testshared/integration/run.go
@@ -63,7 +63,6 @@ func testOneSource(t *testing.T, log *logutils.StderrLog, binPath, sourcePath st
  }
 
  args := []string{
- "--go=1.22", // TODO(ldez) remove this line when we will run go1.23 on the CI. (related to intrange, copyloopvar)
  "--disable-all",
  "--out-format=json",
  "--max-same-issues=100",