Skip to content

Commit

Permalink
Update to Golang 1.22.1
Browse files Browse the repository at this point in the history
  • Loading branch information
darinkrauss committed Mar 7, 2024
1 parent a216970 commit 921d900
Show file tree
Hide file tree
Showing 33 changed files with 2,201 additions and 801 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ dist: jammy
language: go

go:
- 1.21.6
- 1.22.1

services:
- docker

env:
global:
- MONGODB=6.0.12
- MONGOSH=2.1.1
- MONGODB=6.0.14
- MONGOSH=2.1.5

cache:
directories:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Development
FROM golang:1.21.6-alpine AS development
FROM golang:1.22.1-alpine AS development
WORKDIR /go/src/github.com/tidepool-org/shoreline
RUN adduser -D tidepool && \
apk add --no-cache git gcc musl-dev && \
Expand Down
7 changes: 5 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/tidepool-org/shoreline

go 1.21
go 1.22

require (
github.com/Nerzal/gocloak/v12 v12.0.0
Expand All @@ -13,7 +13,7 @@ require (
github.com/kelseyhightower/envconfig v1.4.0
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.18.0
github.com/tidepool-org/clinic/client v0.0.0-20240119154138-fd88ad427641
github.com/tidepool-org/clinic/client v0.0.0-20240307005814-71ebe5953545
github.com/tidepool-org/go-common v0.8.2
github.com/urfave/cli v1.22.14
go.mongodb.org/mongo-driver v1.12.1
Expand Down Expand Up @@ -82,3 +82,6 @@ replace (
google.golang.org/grpc v1.20.1 => google.golang.org/grpc v1.60.1 // Resolve GO-2023-2153
google.golang.org/grpc v1.57.0 => google.golang.org/grpc v1.60.1 // Resolve GO-2023-2153
)

// Resolve GO-2024-2611
replace google.golang.org/protobuf v1.32.0 => google.golang.org/protobuf v1.33.0
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1209,8 +1209,8 @@ github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
github.com/tidepool-org/clinic/client v0.0.0-20240119154138-fd88ad427641 h1:W5WmEC4hGFrVnbYgIpWT+0y6XQF11sYgjGypH2Vf+PU=
github.com/tidepool-org/clinic/client v0.0.0-20240119154138-fd88ad427641/go.mod h1:he08uzpie5EhyTHW8QrtEU0KST19gRX6S+y+/hS7EJw=
github.com/tidepool-org/clinic/client v0.0.0-20240307005814-71ebe5953545 h1:Ko8X3+ebRDvxV6Y5WlUETkS/jEOTGoFXG9zgCu4BzoM=
github.com/tidepool-org/clinic/client v0.0.0-20240307005814-71ebe5953545/go.mod h1:7BpAdFdGJNB3aw/xvCz5XnWjSWRoUtWIX4xcMc4Bsko=
github.com/tidepool-org/go-common v0.8.2 h1:qBD2d6NG2+0jstOCxSN9FI5AKZmHymFzCDaAscPBwRk=
github.com/tidepool-org/go-common v0.8.2/go.mod h1:0S1OUe8aQH8bKLyeemNKW4WOPkCXxK5FqN9OXu1as7E=
github.com/urfave/cli v1.22.14 h1:ebbhrRiGK2i4naQJr+1Xj92HXZCrK7MsyTS/ob3HnAk=
Expand Down Expand Up @@ -1972,8 +1972,8 @@ google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqw
google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
Expand Down
Loading

0 comments on commit 921d900

Please sign in to comment.