diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f32d4804d..df8ac7d84 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,7 +1,7 @@ name: Continuous Integration env: - GO_VERSION: 1.25 + GO_VERSION: 1.26.x on: push: @@ -32,7 +32,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v7 with: - go-version: 1.25.x + go-version: ${{ env.GO_VERSION }} - name: Test code # we're passing -short so that we skip the integration tests, which will be run in parallel below run: | @@ -95,7 +95,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v7 with: - go-version: 1.25.x + go-version: ${{ env.GO_VERSION }} - name: Print git version run: git --version - name: Test code @@ -132,7 +132,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v7 with: - go-version: 1.25.x + go-version: ${{ env.GO_VERSION }} - name: Build linux binary run: | GOOS=linux go build @@ -159,7 +159,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v7 with: - go-version: 1.25.x + go-version: ${{ env.GO_VERSION }} - name: Check Vendor Directory # ensure our vendor directory matches up with our go modules run: | @@ -185,7 +185,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v7 with: - go-version: 1.25.x + go-version: ${{ env.GO_VERSION }} - name: Check formatting run: ./scripts/gofumpt-check.sh - name: Lint @@ -208,7 +208,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v7 with: - go-version: 1.25.x + go-version: ${{ env.GO_VERSION }} - name: Download all coverage artifacts uses: actions/download-artifact@v8 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b7755cc2b..85426e6d5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -162,7 +162,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v7 with: - go-version: 1.25.x + go-version: 1.26.x - name: Run goreleaser uses: goreleaser/goreleaser-action@f06c13b6b1a9625abc9e6e439d9c05a8f2190e94 # v7.2.3 diff --git a/.golangci.yml b/.golangci.yml index e6a2f37ab..79db5dbd7 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,6 +1,6 @@ version: "2" run: - go: "1.25" + go: "1.26" issues: max-issues-per-linter: 0 max-same-issues: 0 diff --git a/Dockerfile b/Dockerfile index 8a18ad8d3..9cc163dbc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ # docker build -t lazygit . # docker run -it lazygit:latest /bin/sh -FROM golang:1.25 as build +FROM golang:1.26 as build WORKDIR /go/src/github.com/jesseduffield/lazygit/ COPY go.mod go.sum ./ RUN go mod download diff --git a/go.mod b/go.mod index 68aa39cea..35e04cd77 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/jesseduffield/lazygit -go 1.25.0 +go 1.26.0 // This is necessary to ignore test files when executing gofumpt. ignore ./test diff --git a/pkg/gui/controllers/helpers/confirmation_helper.go b/pkg/gui/controllers/helpers/confirmation_helper.go index 6bfd7ca4e..68d68575e 100644 --- a/pkg/gui/controllers/helpers/confirmation_helper.go +++ b/pkg/gui/controllers/helpers/confirmation_helper.go @@ -505,7 +505,7 @@ func (self *ConfirmationHelper) TooltipForMenuItem(menuItem *types.MenuItem) str if tooltip != "" { tooltip += "\n\n" } - tooltip += style.FgRed.Sprintf(self.c.Tr.DisabledMenuItemPrefix) + menuItem.DisabledReason.Text + tooltip += style.FgRed.Sprint(self.c.Tr.DisabledMenuItemPrefix) + menuItem.DisabledReason.Text } return tooltip } diff --git a/pkg/gui/options_map.go b/pkg/gui/options_map.go index 880a766b8..80b2b7a4f 100644 --- a/pkg/gui/options_map.go +++ b/pkg/gui/options_map.go @@ -127,7 +127,7 @@ func (self *OptionsMapMgr) formatBindingInfos(bindingInfos []bindingInfo) string break } - formatted := info.style.Sprintf(plainText) + formatted := info.style.Sprint(plainText) if i > 0 { builder.WriteString(theme.OptionsFgColor.Sprint(separator))