Skip to content

Commit

Permalink
chore: bump go to 1.21.8 and protobuf lib to 1.33.0 (#7591)
Browse files Browse the repository at this point in the history
* ci: force go1.21.8 in workflows instead of go.mod

Signed-off-by: mikeee <hey@mike.ee>

* chore: bump google.golang.org/protobuf to 1.33.0

Signed-off-by: mikeee <hey@mike.ee>

* make modtidy-all

Signed-off-by: Artur Souza <asouza.pro@gmail.com>

---------

Signed-off-by: mikeee <hey@mike.ee>
Signed-off-by: Artur Souza <asouza.pro@gmail.com>
Co-authored-by: Artur Souza <asouza.pro@gmail.com>
  • Loading branch information
mikeee and artursouza committed Mar 6, 2024
1 parent b0992a7 commit 5980602
Show file tree
Hide file tree
Showing 16 changed files with 30 additions and 30 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/dapr-perf-components.yml
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ jobs:
id: setup-go
uses: actions/setup-go@v5
with:
go-version-file: 'go.mod'
go-version: '1.21.8'
- name: Login to Azure
if: env.CHECKOUT_REPO != ''
uses: azure/login@v1
Expand Down Expand Up @@ -367,7 +367,7 @@ jobs:
id: setup-go
uses: actions/setup-go@v5
with:
go-version-file: 'go.mod'
go-version: '1.21.8'
- uses: azure/setup-kubectl@v3
with:
version: ${{ env.KUBECTLVER }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dapr-perf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ jobs:
id: setup-go
uses: actions/setup-go@v5
with:
go-version-file: 'go.mod'
go-version: '1.21.8'
- name: Login to Azure
if: env.CHECKOUT_REPO != ''
uses: azure/login@v1
Expand Down Expand Up @@ -401,7 +401,7 @@ jobs:
id: setup-go
uses: actions/setup-go@v5
with:
go-version-file: 'go.mod'
go-version: '1.21.8'
- uses: azure/setup-kubectl@v3
with:
version: ${{ env.KUBECTLVER }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dapr-standalone-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
id: setup-go
uses: actions/setup-go@v5
with:
go-version-file: "go.mod"
go-version: '1.21.8'
- name: Build Dapr's sidecar
run: |
git status
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/dapr-test-sdk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ jobs:
id: setup-go
uses: actions/setup-go@v5
with:
go-version-file: "go.mod"
go-version: '1.21.8'
- name: Checkout python-sdk repo to run tests.
uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -232,7 +232,7 @@ jobs:
id: setup-go
uses: actions/setup-go@v5
with:
go-version-file: "go.mod"
go-version: '1.21.8'
- name: Checkout java-sdk repo to run tests.
uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -404,7 +404,7 @@ jobs:
id: setup-go
uses: actions/setup-go@v5
with:
go-version-file: "go.mod"
go-version: '1.21.8'
- name: Checkout js-sdk repo to run tests.
uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -526,7 +526,7 @@ jobs:
id: setup-go
uses: actions/setup-go@v5
with:
go-version-file: "go.mod"
go-version: '1.21.8'
- name: Set up Python 3.9
uses: actions/setup-python@v4
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dapr-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ jobs:
id: setup-go
uses: actions/setup-go@v5
with:
go-version-file: "go.mod"
go-version: '1.21.8'
- name: Login to Azure
if: env.CHECKOUT_REPO != ''
uses: azure/login@v1
Expand Down Expand Up @@ -448,7 +448,7 @@ jobs:
id: setup-go
uses: actions/setup-go@v5
with:
go-version-file: "go.mod"
go-version: '1.21.8'
- uses: azure/setup-kubectl@v3
with:
version: ${{ env.KUBECTLVER }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/dapr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
id: setup-go
uses: actions/setup-go@v5
with:
go-version-file: "go.mod"
go-version: '1.21.8'
- name: Check white space in .md files
if: github.event_name == 'pull_request'
run: |
Expand Down Expand Up @@ -132,7 +132,7 @@ jobs:
id: setup-go
uses: actions/setup-go@v5
with:
go-version-file: "go.mod"
go-version: '1.21.8'
- name: Run make test
env:
COVERAGE_OPTS: "-coverprofile=coverage.txt -covermode=atomic"
Expand Down Expand Up @@ -176,7 +176,7 @@ jobs:
id: setup-go
uses: actions/setup-go@v5
with:
go-version-file: "go.mod"
go-version: '1.21.8'
- name: Build binaries
run: make build
- name: Override DAPR_HOST_IP for MacOS
Expand Down Expand Up @@ -268,7 +268,7 @@ jobs:
id: setup-go
uses: actions/setup-go@v5
with:
go-version-file: "go.mod"
go-version: '1.21.8'
- name: Parse release version and set REL_VERSION and LATEST_RELEASE
run: python ./.github/scripts/get_release_version.py ${{ github.event_name }}
- name: Updates version for sidecar flavor
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/kind-e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ jobs:
id: setup-go
uses: actions/setup-go@v5
with:
go-version-file: 'go.mod'
go-version: '1.21.8'
- name: Configure KinD
# Generate a KinD configuration file that uses:
# (a) a couple of worker nodes: this is needed to run both
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/version-skew.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ jobs:
id: setup-go
uses: actions/setup-go@v4
with:
go-version-file: 'go.mod'
go-version: '1.21.8'

- name: Build & download binaries
run: |
Expand Down Expand Up @@ -296,7 +296,7 @@ jobs:
id: setup-go
uses: actions/setup-go@v5
with:
go-version-file: 'go.mod'
go-version: '1.21.8'
- name: Configure KinD
run: |
cat > kind.yaml <<EOF
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ require (
google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0
google.golang.org/grpc v1.60.1
google.golang.org/grpc/examples v0.0.0-20230224211313-3775f633ce20
google.golang.org/protobuf v1.32.0
google.golang.org/protobuf v1.33.0
gopkg.in/yaml.v3 v3.0.1
k8s.io/api v0.28.4
k8s.io/apiextensions-apiserver v0.28.4
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -2310,8 +2310,8 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.28.1/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/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk=
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk=
Expand Down
2 changes: 1 addition & 1 deletion tests/apps/resiliencyapp/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
github.com/gorilla/mux v1.8.1
google.golang.org/grpc v1.60.1
google.golang.org/grpc/examples v0.0.0-20230224211313-3775f633ce20
google.golang.org/protobuf v1.32.0
google.golang.org/protobuf v1.33.0
)

require (
Expand Down
4 changes: 2 additions & 2 deletions tests/apps/resiliencyapp/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ google.golang.org/grpc/examples v0.0.0-20230224211313-3775f633ce20 h1:MLBCGN1O7G
google.golang.org/grpc/examples v0.0.0-20230224211313-3775f633ce20/go.mod h1:Nr5H8+MlGWr5+xX/STzdoEqJrO+YteqFbMyCsrb6mH0=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
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/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
2 changes: 1 addition & 1 deletion tests/apps/resiliencyapp_grpc/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/dapr/dapr v1.7.4
google.golang.org/grpc v1.60.1
google.golang.org/grpc/examples v0.0.0-20230224211313-3775f633ce20
google.golang.org/protobuf v1.32.0
google.golang.org/protobuf v1.33.0
)

require (
Expand Down
4 changes: 2 additions & 2 deletions tests/apps/resiliencyapp_grpc/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ google.golang.org/grpc/examples v0.0.0-20230224211313-3775f633ce20 h1:MLBCGN1O7G
google.golang.org/grpc/examples v0.0.0-20230224211313-3775f633ce20/go.mod h1:Nr5H8+MlGWr5+xX/STzdoEqJrO+YteqFbMyCsrb6mH0=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
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/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
2 changes: 1 addition & 1 deletion tests/apps/service_invocation_grpc_proxy_client/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ require (
golang.org/x/sys v0.17.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 // indirect
google.golang.org/protobuf v1.32.0 // indirect
google.golang.org/protobuf v1.33.0 // indirect
)

replace github.com/dapr/dapr => ../../../
4 changes: 2 additions & 2 deletions tests/apps/service_invocation_grpc_proxy_client/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ google.golang.org/grpc/examples v0.0.0-20230224211313-3775f633ce20 h1:MLBCGN1O7G
google.golang.org/grpc/examples v0.0.0-20230224211313-3775f633ce20/go.mod h1:Nr5H8+MlGWr5+xX/STzdoEqJrO+YteqFbMyCsrb6mH0=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
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/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

0 comments on commit 5980602

Please sign in to comment.