Skip to content
This repository has been archived by the owner on Sep 26, 2023. It is now read-only.

deps: update grpc to 1.42.1 #1559

Merged
merged 8 commits into from Nov 29, 2021
Merged

deps: update grpc to 1.42.1 #1559

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d002a94
deps: update grpc to 1.42.1
Neenu1995 Nov 16, 2021
b656ba8
test: print bazel version
Neenu1995 Nov 16, 2021
d9be70d
deps: update protobuf version to 3.19.1
Neenu1995 Nov 16, 2021
e6574f4
Merge branch 'main' into update-grpc
Neenu1995 Nov 19, 2021
e4f7333
test: try googleapis container gcr.io/gapic-images/googleapis:latest
Neenu1995 Nov 19, 2021
05c412e
test: try using no container
Neenu1995 Nov 19, 2021
a4d8628
Merge remote-tracking branch 'origin/main' into update-grpc
suztomo Nov 29, 2021
89caae0
chore: clarified comment on not using container in Bazel build
suztomo Nov 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/ci.yaml
View file
Open in desktop
Expand Up @@ -22,7 +22,6 @@ jobs:

bazel:
runs-on: ubuntu-latest
container: gcr.io/gapic-images/googleapis-bazel:20210105
Copy link
Member

Choose a reason for hiding this comment

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

This had Bazel 3.

steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v1
Expand Down Expand Up @@ -53,7 +52,10 @@ jobs:
echo "The old one will disappear after 7 days."

- name: Run bazel tests
run: bazel --batch test //... --noshow_progress --test_output=errors
run: |
which bazel
bazel --version
bazel --batch test //... --noshow_progress --test_output=errors

- uses: actions/upload-artifact@v2
if: ${{ failure() }}
Expand Down
4 changes: 2 additions & 2 deletions dependencies.properties
View file
Open in desktop
Expand Up @@ -23,9 +23,9 @@ version.gax_httpjson=0.92.1-SNAPSHOT
# Versions for dependencies which actual artifacts differ between Bazel and Gradle.
# Gradle build depends on prebuilt maven artifacts, while Bazel build depends on Bazel workspaces
# with the sources.
version.com_google_protobuf=3.18.1
version.com_google_protobuf=3.19.1
Copy link
Member

@suztomo suztomo Nov 19, 2021 •
edited

Choose a reason for hiding this comment

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

As per #1566, this protobuf version upgrade causes the problem "The repository '@maven' could not be resolved and referenced by '@com_google_protobuf//java/util:util". gRPC is not the one causing it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We have to upgrade to the latest in protobuf too. The rest of the java client libraries will upgrade to protobuf 3.19.1 with shared deps 2.5.0.

Copy link
Member

Choose a reason for hiding this comment

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

#1571 will fix the protobuf problem.

Copy link
Member

Choose a reason for hiding this comment

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

1571 has been merged.

version.google_java_format=1.1
version.io_grpc=1.41.0
version.io_grpc=1.42.1

# Maven artifacts.
# Note, the actual name of each property matters (bazel build scripts depend on it).
Expand Down