Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies and checkers #3016

Merged
merged 3 commits into from
Jun 24, 2022
Merged

Update dependencies and checkers #3016

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
48b8a6c
Update dependencies and checkers
alexshtin Jun 23, 2022
42cd84a
Pin tchannel
alexshtin Jun 23, 2022
cae7366
Fix build
alexshtin Jun 23, 2022
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: 8 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,11 @@ UNIT_TEST_DIRS := $(filter-out $(INTEG_TEST_ROOT)% $(INTEG_TEST_XDC_ROOT)% $(IN

ALL_SCRIPTS := $(shell find . -name "*.sh")

# TODO: remove tchannel-go if there is a version above 1.30.0.
PINNED_DEPENDENCIES := \
github.com/apache/thrift@v0.0.0-20161221203622-b2a4d4ae21c7 \
github.com/go-sql-driver/mysql@v1.5.0
github.com/uber/tchannel-go@v1.22.3 \
github.com/go-sql-driver/mysql@v1.5.0

# Code coverage output files.
COVER_ROOT := ./.coverage
Expand All @@ -103,10 +105,10 @@ update-checkers:
@printf $(COLOR) "Install/update check tools..."
@go install golang.org/x/lint/golint@latest
@go install golang.org/x/tools/cmd/goimports@latest
@go install honnef.co/go/tools/cmd/staticcheck@master # TODO: Set concrete version above 0.2.2 here.
@go install github.com/kisielk/errcheck@v1.6.0
@go install github.com/googleapis/api-linter/cmd/api-linter@v1.31.0
@go install github.com/bufbuild/buf/cmd/buf@v1.4.0
@go install honnef.co/go/tools/cmd/staticcheck@v0.3.2
@go install github.com/kisielk/errcheck@v1.6.1
@go install github.com/googleapis/api-linter/cmd/api-linter@v1.32.3
@go install github.com/bufbuild/buf/cmd/buf@v1.6.0

update-mockgen:
@printf $(COLOR) "Install/update mockgen tool..."
Expand All @@ -123,7 +125,7 @@ update-tctl:
@printf $(COLOR) "Install/update tctl..."
@go install github.com/temporalio/tctl/cmd/tctl@latest

update-new-ui:
update-ui:
@printf $(COLOR) "Install/update temporal ui-server..."
@go install github.com/temporalio/ui-server/cmd/server@latest

Expand Down
29 changes: 17 additions & 12 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ module go.temporal.io/server
go 1.18

require (
cloud.google.com/go/storage v1.22.1
github.com/aws/aws-sdk-go v1.44.39
cloud.google.com/go/storage v1.23.0
github.com/aws/aws-sdk-go v1.44.41
github.com/aws/aws-sdk-go-v2 v1.16.5
github.com/aws/aws-sdk-go-v2/config v1.15.11
github.com/aws/aws-sdk-go-v2/feature/rds/auth v1.1.22
Expand All @@ -17,7 +17,7 @@ require (
github.com/gocql/gocql v1.1.0
github.com/gogo/protobuf v1.3.2
github.com/gogo/status v1.1.1
github.com/golang-jwt/jwt/v4 v4.4.1
github.com/golang-jwt/jwt/v4 v4.4.2
github.com/golang/mock v1.6.0
github.com/google/go-cmp v0.5.8
github.com/google/uuid v1.3.0
Expand All @@ -33,7 +33,7 @@ require (
github.com/stretchr/testify v1.7.4
github.com/temporalio/ringpop-go v0.0.0-20211012191444-6f91b5915e95
github.com/uber-go/tally/v4 v4.1.2
github.com/uber/tchannel-go v1.31.0
github.com/uber/tchannel-go v1.22.3
github.com/urfave/cli v1.22.9
github.com/urfave/cli/v2 v2.10.2
github.com/xwb1989/sqlparser v0.0.0-20180606152119-120387863bf2
Expand All @@ -53,17 +53,22 @@ require (
go.uber.org/multierr v1.8.0
go.uber.org/zap v1.21.0
golang.org/x/exp v0.0.0-20220613132600-b0d781184e0d
golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb
golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2
golang.org/x/time v0.0.0-20220609170525-579cf78fd858
google.golang.org/api v0.85.0
google.golang.org/grpc v1.47.0
google.golang.org/grpc/examples v0.0.0-20220621173437-b288a2407a71
google.golang.org/grpc/examples v0.0.0-20220623204041-06ad0b82211b
gopkg.in/square/go-jose.v2 v2.6.0
gopkg.in/validator.v2 v2.0.1
gopkg.in/yaml.v3 v3.0.1
modernc.org/sqlite v1.17.3
)

require (
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought we were trying to keep to two sections?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

github.com/streadway/quantile v0.0.0-20220407130108-4246515d968d // indirect
github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
)

require (
cloud.google.com/go v0.102.1 // indirect
cloud.google.com/go/compute v1.7.0 // indirect
Expand Down Expand Up @@ -95,7 +100,7 @@ require (
github.com/googleapis/gax-go/v2 v2.4.0 // indirect
github.com/googleapis/go-type-adapters v1.0.0 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.10.3 // indirect
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
Expand Down Expand Up @@ -123,17 +128,17 @@ require (
go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.30.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.7.0 // indirect
go.opentelemetry.io/otel/trace v1.7.0
go.opentelemetry.io/proto/otlp v0.16.0 // indirect
go.opentelemetry.io/proto/otlp v0.18.0 // indirect
go.uber.org/dig v1.14.1 // indirect
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
golang.org/x/net v0.0.0-20220621193019-9d032be2e588 // indirect
golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c // indirect
golang.org/x/net v0.0.0-20220622184535-263ec571b305 // indirect
golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/tools v0.1.11 // indirect
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20220621134657-43db42f103f7 // indirect
google.golang.org/genproto v0.0.0-20220623142657-077d458a5694 // indirect
google.golang.org/protobuf v1.28.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
lukechampine.com/uint128 v1.2.0 // indirect
Expand Down
Loading