Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Continuous Integration

env:
GO_VERSION: 1.25
GO_VERSION: 1.26.x

on:
push:
Expand Down Expand Up @@ -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: |
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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: |
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version: "2"
run:
go: "1.25"
go: "1.26"
issues:
max-issues-per-linter: 0
max-same-issues: 0
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/gui/controllers/helpers/confirmation_helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
2 changes: 1 addition & 1 deletion pkg/gui/options_map.go
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
Loading