diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f7a665d..97bfe7d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/setup-go@v6 with: - go-version: 1.17 + go-version-file: go.mod - uses: actions/cache@v6 with: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 8d707d8..fcbb7e7 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/setup-go@v6 with: - go-version: 1.17 + go-version-file: go.mod - name: lint uses: golangci/golangci-lint-action@v9 diff --git a/go.mod b/go.mod index 2f80789..0bc11f9 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,3 @@ module github.com/peter-evans/patience -go 1.17 +go 1.25 diff --git a/lcs.go b/lcs.go index 30547e0..219886c 100644 --- a/lcs.go +++ b/lcs.go @@ -44,12 +44,3 @@ func LCS(a, b []string) [][2]int { return s } - -// max returns the maximum of two integers. -// nolint:predeclared -func max(a, b int) int { - if a > b { - return a - } - return b -} diff --git a/unified.go b/unified.go index 2d5f2b7..4e785b7 100644 --- a/unified.go +++ b/unified.go @@ -141,12 +141,3 @@ func makeHunks(diffs []DiffLine, precontext, postcontext int) []Hunk { return hunks } - -// min returns the minimum of two integers. -// nolint:predeclared -func min(a, b int) int { - if a < b { - return a - } - return b -}