Skip to content

Commit 3747e5b

Browse files
authored
Upgrade to go 1.23 (#110)
1 parent ca7ff7c commit 3747e5b

File tree

6 files changed

+14
-12
lines changed

6 files changed

+14
-12
lines changed

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
test:
1111
strategy:
1212
matrix:
13-
go-version: [1.19.x, 1.20.x, 1.21.x]
13+
go-version: [1.21.x, 1.22.x, 1.23.x]
1414
os: [ubuntu-latest, macos-latest]
1515
runs-on: ${{ matrix.os }}
1616
steps:
@@ -21,6 +21,6 @@ jobs:
2121
- name: golangci-lint
2222
uses: golangci/golangci-lint-action@v3
2323
with:
24-
version: v1.55
24+
version: v1.63
2525
- run: go vet ./...
2626
- run: go test -tags skipsecretserviceintegrationtests ./...

.golangci.yml

+2
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@ linters:
99
- gofmt
1010
- gocritic
1111
- unconvert
12+
- revive
13+
- govet

datetime.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ func unixToAbsoluteTime(s int64, ns int64) C.CFAbsoluteTime {
3434
}
3535

3636
func absoluteTimeToUnix(abs C.CFAbsoluteTime) (int64, int64) {
37-
int, frac := math.Modf(float64(abs))
38-
return int64(int) + absoluteTimeIntervalSince1970(), int64(frac * nsPerSec)
37+
i, frac := math.Modf(float64(abs))
38+
return int64(i) + absoluteTimeIntervalSince1970(), int64(frac * nsPerSec)
3939
}
4040

4141
// TimeToCFDate will convert the given time.Time to a CFDateRef, which

go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
module github.com/keybase/go-keychain
22

3-
go 1.19
3+
go 1.21
44

55
require (
66
github.com/keybase/dbus v0.0.0-20220506165403-5aa21ea2c23a
77
github.com/pkg/errors v0.9.1
8-
github.com/stretchr/testify v1.8.4
9-
golang.org/x/crypto v0.31.0
8+
github.com/stretchr/testify v1.10.0
9+
golang.org/x/crypto v0.32.0
1010
)
1111

1212
require (

go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
66
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
77
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
88
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
9-
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
10-
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
11-
golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
12-
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
9+
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
10+
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
11+
golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
12+
golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
1313
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
1414
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
1515
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

secretservice/secretservice_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func TestKeyringDH(t *testing.T) {
2525
func testKeyring(t *testing.T, mode AuthenticationMode) {
2626
srv, err := NewService()
2727
require.NoError(t, err)
28-
session, err := srv.OpenSession(AuthenticationDHAES)
28+
session, err := srv.OpenSession(mode)
2929
require.NoError(t, err)
3030
defer srv.CloseSession(session)
3131

0 commit comments

Comments
 (0)