Bump go version to 1.22 (#3574)

- **PR Description**

Bumps go from 1.21 to 1.22, and removes newly redundant loop variable
re-declarations now that in 1.22 the variables are automatically
redeclared in each iteration for us.

- **Please check if the PR fulfills these requirements**

* [ ] Cheatsheets are up-to-date (run `go generate ./...`)
* [ ] Code has been formatted (see
[here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#code-formatting))
* [ ] Tests have been added/updated (see
[here](https://github.com/jesseduffield/lazygit/blob/master/pkg/integration/README.md)
for the integration test guide)
* [ ] Text is internationalised (see
[here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#internationalisation))
* [ ] Docs (specifically `docs/Config.md`) have been updated if
necessary
* [ ] You've read through your own file changes for silly mistakes etc

<!--
Be sure to name your PR with an imperative e.g. 'Add worktrees view'
see https://github.com/jesseduffield/lazygit/releases/tag/v0.40.0 for
examples
-->

.github/workflows/cd.yml

@@ -3,7 +3,7 @@ name: Continuous Delivery
 on:
  push:
  tags:
- - 'v*'
+ - "v*"
 
 jobs:
  goreleaser:
@@ -16,7 +16,7 @@ jobs:
  - name: Setup Go
  uses: actions/setup-go@v4
  with:
- go-version: 1.21.x
+ go-version: 1.22.x
  - name: Run goreleaser
  uses: goreleaser/goreleaser-action@v4
  with:

.github/workflows/ci.yml

@@ -1,7 +1,7 @@
 name: Continuous Integration
 
 env:
- GO_VERSION: 1.21
+ GO_VERSION: 1.22
 
 on:
  push:
@@ -32,7 +32,7 @@ jobs:
  - name: Setup Go
  uses: actions/setup-go@v4
  with:
- go-version: 1.21.x
+ go-version: 1.22.x
  - name: Test code
  # we're passing -short so that we skip the integration tests, which will be run in parallel below
  run: |
@@ -89,7 +89,7 @@ jobs:
  - name: Setup Go
  uses: actions/setup-go@v4
  with:
- go-version: 1.21.x
+ go-version: 1.22.x
  - name: Print git version
  run: git --version
  - name: Test code
@@ -115,7 +115,7 @@ jobs:
  - name: Setup Go
  uses: actions/setup-go@v4
  with:
- go-version: 1.21.x
+ go-version: 1.22.x
  - name: Build linux binary
  run: |
  GOOS=linux go build
@@ -142,7 +142,7 @@ jobs:
  - name: Setup Go
  uses: actions/setup-go@v4
  with:
- go-version: 1.21.x
+ go-version: 1.22.x
  - name: Check Vendor Directory
  # ensure our vendor directory matches up with our go modules
  run: |
@@ -168,7 +168,7 @@ jobs:
  - name: Setup Go
  uses: actions/setup-go@v4
  with:
- go-version: 1.21.x
+ go-version: 1.22.x
  - name: Lint
  uses: golangci/[email protected]
  with:
@@ -194,6 +194,11 @@ jobs:
  - name: Checkout code
  uses: actions/checkout@v3
 
+ - name: Setup Go
+ uses: actions/setup-go@v4
+ with:
+ go-version: 1.22.x
+
  - name: Download all coverage artifacts
  uses: actions/download-artifact@v3
  with:

.golangci.yml

@@ -30,5 +30,5 @@ linters-settings:
  max-func-lines: 0
 
 run:
- go: '1.21'
+ go: '1.22'
  timeout: 10m

Dockerfile

@@ -2,7 +2,7 @@
 # docker build -t lazygit .
 # docker run -it lazygit:latest /bin/sh
 
-FROM golang:1.21 as build
+FROM golang:1.22 as build
 WORKDIR /go/src/github.com/jesseduffield/lazygit/
 COPY go.mod go.sum ./
 RUN go mod download

go.mod

@@ -1,6 +1,6 @@
 module github.com/jesseduffield/lazygit
 
-go 1.21
+go 1.22
 
 require (
  github.com/adrg/xdg v0.4.0

pkg/commands/git_commands/branch_test.go

@@ -41,7 +41,6 @@ func TestBranchGetCommitDifferences(t *testing.T) {
  }
 
  for _, s := range scenarios {
- s := s
  t.Run(s.testName, func(t *testing.T) {
  instance := buildBranchCommands(commonDeps{runner: s.runner})
  pushables, pullables := instance.GetCommitDifferences("HEAD", "@{u}")
@@ -89,7 +88,6 @@ func TestBranchDeleteBranch(t *testing.T) {
  }
 
  for _, s := range scenarios {
- s := s
  t.Run(s.testName, func(t *testing.T) {
  instance := buildBranchCommands(commonDeps{runner: s.runner})
 
@@ -150,7 +148,6 @@ func TestBranchMerge(t *testing.T) {
  }
 
  for _, s := range scenarios {
- s := s
  t.Run(s.testName, func(t *testing.T) {
  runner := oscommands.NewFakeRunner(t).
  ExpectGitArgs(s.expected, "", nil)
@@ -190,7 +187,6 @@ func TestBranchCheckout(t *testing.T) {
  }
 
  for _, s := range scenarios {
- s := s
  t.Run(s.testName, func(t *testing.T) {
  instance := buildBranchCommands(commonDeps{runner: s.runner})
  s.test(instance.Checkout("test", CheckoutOptions{Force: s.force}))
@@ -279,7 +275,6 @@ func TestBranchCurrentBranchInfo(t *testing.T) {
  }
 
  for _, s := range scenarios {
- s := s
  t.Run(s.testName, func(t *testing.T) {
  instance := buildBranchCommands(commonDeps{runner: s.runner})
  s.test(instance.CurrentBranchInfo())

pkg/commands/git_commands/commit_loader.go

@@ -505,8 +505,6 @@ func (self *CommitLoader) getExistingMainBranches() []string {
 
  for i, branchName := range mainBranches {
  wg.Add(1)
- i := i
- branchName := branchName
  go utils.Safe(func() {
  defer wg.Done()
 

pkg/commands/git_commands/commit_loader_test.go

@@ -303,7 +303,6 @@ func TestGetCommits(t *testing.T) {
  }
 
  for _, scenario := range scenarios {
- scenario := scenario
  t.Run(scenario.testName, func(t *testing.T) {
  common := utils.NewDummyCommon()
  common.AppState = &config.AppState{}

pkg/commands/git_commands/commit_test.go

@@ -30,7 +30,6 @@ func TestCommitRewordCommit(t *testing.T) {
  },
  }
  for _, s := range scenarios {
- s := s
  t.Run(s.testName, func(t *testing.T) {
  instance := buildCommitCommands(commonDeps{runner: s.runner})
 
@@ -100,7 +99,6 @@ func TestCommitCommitCmdObj(t *testing.T) {
  }
 
  for _, s := range scenarios {
- s := s
  t.Run(s.testName, func(t *testing.T) {
  userConfig := config.GetDefaultConfig()
  userConfig.Git.Commit.SignOff = s.configSignoff
@@ -136,7 +134,6 @@ func TestCommitCommitEditorCmdObj(t *testing.T) {
  }
 
  for _, s := range scenarios {
- s := s
  t.Run(s.testName, func(t *testing.T) {
  userConfig := config.GetDefaultConfig()
  userConfig.Git.Commit.SignOff = s.configSignoff
@@ -171,7 +168,6 @@ func TestCommitCreateFixupCommit(t *testing.T) {
  }
 
  for _, s := range scenarios {
- s := s
  t.Run(s.testName, func(t *testing.T) {
  instance := buildCommitCommands(commonDeps{runner: s.runner})
  s.test(instance.CreateFixupCommit(s.hash))
@@ -221,7 +217,6 @@ func TestCommitCreateAmendCommit(t *testing.T) {
  }
 
  for _, s := range scenarios {
- s := s
  t.Run(s.testName, func(t *testing.T) {
  instance := buildCommitCommands(commonDeps{runner: s.runner})
  err := instance.CreateAmendCommit(s.originalSubject, s.newSubject, s.newDescription, s.includeFileChanges)
@@ -285,7 +280,6 @@ func TestCommitShowCmdObj(t *testing.T) {
  }
 
  for _, s := range scenarios {
- s := s
  t.Run(s.testName, func(t *testing.T) {
  userConfig := config.GetDefaultConfig()
  userConfig.Git.Paging.ExternalDiffCommand = s.extDiffCmd
@@ -334,7 +328,6 @@ func TestGetCommitMsg(t *testing.T) {
  }
 
  for _, s := range scenarios {
- s := s
  t.Run(s.testName, func(t *testing.T) {
  instance := buildCommitCommands(commonDeps{
  runner: oscommands.NewFakeRunner(t).ExpectGitArgs([]string{"-c", "log.showsignature=false", "log", "--format=%B", "--max-count=1", "deadbeef"}, s.input, nil),
@@ -374,7 +367,6 @@ func TestGetCommitMessageFromHistory(t *testing.T) {
  }
 
  for _, s := range scenarios {
- s := s
  t.Run(s.testName, func(t *testing.T) {
  instance := buildCommitCommands(commonDeps{runner: s.runner})
 

pkg/commands/git_commands/file_loader_test.go

@@ -172,7 +172,6 @@ func TestFileGetStatusFiles(t *testing.T) {
  }
 
  for _, s := range scenarios {
- s := s
  t.Run(s.testName, func(t *testing.T) {
  cmd := oscommands.NewDummyCmdObjBuilder(s.runner)
 

pkg/commands/git_commands/flow_test.go

@@ -23,7 +23,6 @@ func TestStartCmdObj(t *testing.T) {
  }
 
  for _, s := range scenarios {
- s := s
  t.Run(s.testName, func(t *testing.T) {
  instance := buildFlowCommands(commonDeps{})
 
@@ -69,7 +68,6 @@ func TestFinishCmdObj(t *testing.T) {
  }
 
  for _, s := range scenarios {
- s := s
  t.Run(s.testName, func(t *testing.T) {
  instance := buildFlowCommands(commonDeps{
  gitConfig: git_config.NewFakeGitConfig(s.gitConfigMockResponses),

pkg/commands/git_commands/rebase_test.go

@@ -67,7 +67,6 @@ func TestRebaseRebaseBranch(t *testing.T) {
  }
 
  for _, s := range scenarios {
- s := s
  t.Run(s.testName, func(t *testing.T) {
  instance := buildRebaseCommands(commonDeps{runner: s.runner, gitVersion: s.gitVersion})
  s.test(instance.RebaseBranch(s.arg))
@@ -89,7 +88,6 @@ func TestRebaseSkipEditorCommand(t *testing.T) {
  `^GIT_SEQUENCE_EDITOR=.*$`,
  "^" + daemon.DaemonKindEnvKey + "=" + strconv.Itoa(int(daemon.DaemonKindExitImmediately)) + "$",
  } {
- regexStr := regexStr
  foundMatch := lo.ContainsBy(envVars, func(envVar string) bool {
  return regexp.MustCompile(regexStr).MatchString(envVar)
  })
@@ -163,7 +161,6 @@ func TestRebaseDiscardOldFileChanges(t *testing.T) {
  }
 
  for _, s := range scenarios {
- s := s
  t.Run(s.testName, func(t *testing.T) {
  instance := buildRebaseCommands(commonDeps{
  runner: s.runner,

pkg/commands/git_commands/reflog_commit_loader_test.go

@@ -176,7 +176,6 @@ func TestGetReflogCommits(t *testing.T) {
  }
 
  for _, scenario := range scenarios {
- scenario := scenario
  t.Run(scenario.testName, func(t *testing.T) {
  builder := &ReflogCommitLoader{
  Common: utils.NewDummyCommon(),

pkg/commands/git_commands/repo_paths_test.go

@@ -101,7 +101,6 @@ func TestGetRepoPaths(t *testing.T) {
  }
 
  for _, s := range scenarios {
- s := s
  t.Run(s.Name, func(t *testing.T) {
  runner := oscommands.NewFakeRunner(t)
  cmd := oscommands.NewDummyCmdObjBuilder(runner)

pkg/commands/git_commands/stash_loader_test.go

@@ -47,7 +47,6 @@ func TestGetStashEntries(t *testing.T) {
  }
 
  for _, s := range scenarios {
- s := s
  t.Run(s.testName, func(t *testing.T) {
  cmd := oscommands.NewDummyCmdObjBuilder(s.runner)
 

pkg/commands/git_commands/stash_test.go

@@ -74,7 +74,6 @@ func TestStashStore(t *testing.T) {
  }
 
  for _, s := range scenarios {
- s := s
  t.Run(s.testName, func(t *testing.T) {
  runner := oscommands.NewFakeRunner(t).
  ExpectGitArgs(s.expected, "", nil)
@@ -131,7 +130,6 @@ func TestStashStashEntryCmdObj(t *testing.T) {
  }
 
  for _, s := range scenarios {
- s := s
  t.Run(s.testName, func(t *testing.T) {
  userConfig := config.GetDefaultConfig()
  appState := &config.AppState{}
@@ -181,7 +179,6 @@ func TestStashRename(t *testing.T) {
  }
 
  for _, s := range scenarios {
- s := s
  t.Run(s.testName, func(t *testing.T) {
  runner := oscommands.NewFakeRunner(t).
  ExpectGitArgs(s.expectedHashCmd, s.hashResult, nil).

pkg/commands/git_commands/sync_test.go

@@ -86,7 +86,6 @@ func TestSyncPush(t *testing.T) {
  }
 
  for _, s := range scenarios {
- s := s
  t.Run(s.testName, func(t *testing.T) {
  instance := buildSyncCommands(commonDeps{})
  task := gocui.NewFakeTask()
@@ -124,7 +123,6 @@ func TestSyncFetch(t *testing.T) {
  }
 
  for _, s := range scenarios {
- s := s
  t.Run(s.testName, func(t *testing.T) {
  instance := buildSyncCommands(commonDeps{})
  instance.UserConfig.Git.FetchAll = s.fetchAllConfig
@@ -163,7 +161,6 @@ func TestSyncFetchBackground(t *testing.T) {
  }
 
  for _, s := range scenarios {
- s := s
  t.Run(s.testName, func(t *testing.T) {
  instance := buildSyncCommands(commonDeps{})
  instance.UserConfig.Git.FetchAll = s.fetchAllConfig

pkg/commands/git_commands/tag_loader_test.go

@@ -44,7 +44,6 @@ func TestGetTags(t *testing.T) {
  }
 
  for _, scenario := range scenarios {
- scenario := scenario
  t.Run(scenario.testName, func(t *testing.T) {
  loader := &TagLoader{
  Common: utils.NewDummyCommon(),