Skip to content

Commit c74507b

Browse files
authored
More low hanging fruit (version bumps, mostly) (segmentio#171)
* Fix typo and update release workflow * Update Goreleaser config * Explicitly mark go.sum as generated * Update dependencies Should clear out some Dependabot notices.
1 parent 4d933e6 commit c74507b

File tree

7 files changed

+116
-61
lines changed

7 files changed

+116
-61
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
_fixtures/* text eol=lf
2+
/go.sum linguist-generated

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ permissions:
99
jobs:
1010
goreleaser:
1111
# using Ubuntu 22.04 should help maximize the
12-
# glibc compatibility since across the board
12+
# glibc compatibility across the board
1313
# without using a too-old-to-support version
1414
# of Ubuntu.
1515
runs-on: ubuntu-22.04

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ permissions:
1111
jobs:
1212
goreleaser:
1313
# using Ubuntu 22.04 should help maximize the
14-
# glibc compatibility since across the board
14+
# glibc compatibility across the board
1515
# without using a too-old-to-support version
1616
# of Ubuntu.
1717
runs-on: ubuntu-22.04
@@ -24,7 +24,7 @@ jobs:
2424
go-version: "1.24"
2525
cache: false
2626
- name: release golines
27-
uses: goreleaser/goreleaser-action@v5
27+
uses: goreleaser/goreleaser-action@v6
2828
with:
2929
distribution: goreleaser
3030
version: latest

.goreleaser.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
project_name: golines
2+
version: 2
23
before:
34
hooks:
45
- go clean -x
@@ -28,7 +29,7 @@ archives:
2829
wrap_in_directory: true
2930

3031
snapshot:
31-
name_template: "{{ incpatch .Version }}-pre+{{ .ShortCommit }}"
32+
version_template: "{{ incpatch .Version }}-pre+{{ .ShortCommit }}"
3233

3334
changelog:
3435
use: github

go.mod

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,31 @@ module github.com/segmentio/golines
33
go 1.23.0
44

55
require (
6+
github.com/alecthomas/kingpin/v2 v2.4.0
67
github.com/dave/dst v0.27.3
7-
github.com/dave/jennifer v1.7.0
8+
github.com/dave/jennifer v1.7.1
89
github.com/fatih/structtag v1.2.0
910
github.com/pmezard/go-difflib v1.0.0
1011
github.com/sirupsen/logrus v1.9.3
11-
github.com/stretchr/testify v1.8.4
12+
github.com/stretchr/testify v1.10.0
1213
github.com/x-cray/logrus-prefixed-formatter v0.5.2
13-
golang.org/x/term v0.27.0
14-
gopkg.in/alecthomas/kingpin.v2 v2.2.6
14+
golang.org/x/term v0.34.0
1515
)
1616

1717
require (
18-
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
19-
github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 // indirect
18+
github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b // indirect
2019
github.com/davecgh/go-spew v1.1.1 // indirect
21-
github.com/mattn/go-colorable v0.1.13 // indirect
20+
github.com/google/go-cmp v0.7.0 // indirect
21+
github.com/mattn/go-colorable v0.1.14 // indirect
2222
github.com/mattn/go-isatty v0.0.20 // indirect
2323
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
24-
github.com/onsi/ginkgo v1.10.2 // indirect
25-
github.com/onsi/gomega v1.7.0 // indirect
26-
golang.org/x/crypto v0.31.0 // indirect
27-
golang.org/x/mod v0.25.0 // indirect
28-
golang.org/x/sync v0.15.0 // indirect
29-
golang.org/x/sys v0.33.0 // indirect
30-
golang.org/x/tools v0.34.0 // indirect
31-
gopkg.in/yaml.v2 v2.4.0 // indirect
24+
github.com/onsi/ginkgo v1.16.5 // indirect
25+
github.com/onsi/gomega v1.38.0 // indirect
26+
github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
27+
golang.org/x/crypto v0.41.0 // indirect
28+
golang.org/x/mod v0.27.0 // indirect
29+
golang.org/x/sync v0.16.0 // indirect
30+
golang.org/x/sys v0.35.0 // indirect
31+
golang.org/x/tools v0.36.0 // indirect
3232
gopkg.in/yaml.v3 v3.0.1 // indirect
3333
)

go.sum

Lines changed: 94 additions & 41 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
"runtime/pprof"
1111
"strings"
1212

13+
kingpin "github.com/alecthomas/kingpin/v2"
1314
log "github.com/sirupsen/logrus"
1415
prefixed "github.com/x-cray/logrus-prefixed-formatter"
15-
kingpin "gopkg.in/alecthomas/kingpin.v2"
1616
)
1717

1818
var (

0 commit comments

Comments
 (0)