Skip to content

Commit

Permalink
Dependency: Update rules_go, Go, Python, curl, bazel-toolchains, baze…
Browse files Browse the repository at this point in the history
…lisk (#7934)

Description: Update dependencies:
- rules_go 0.19.2 ([release](https://github.com/bazelbuild/rules_go/releases/tag/0.19.2)), [0.19.0 release notes](https://github.com/bazelbuild/rules_go/releases/tag/0.19.0). The big change is that `org_golang_google_grpc` is no longer declared in `go_rules_dependencies`. In order for the API to build, changes to `WORKSPACE` outlined [here](https://github.com/bazelbuild/rules_go/blob/0.19.0/go/workspace.rst#grpc-dependencies) are required. This pollutes `WORKSPACE` with some dependencies. Open on ways to improve this.
- Go 1.12.8 (to match rules_go)
- various Python updates
- curl 7.65.3 ([changelog](https://curl.haxx.se/changes.html#7_65_3))
- bazel-toolchains switches to 0.28.5 release and address @lizan TODO ([changes](bazelbuild/bazel-toolchains@5a8611e...0.28.5))
- bazelisk 1.0 ([release notes](https://github.com/bazelbuild/bazelisk/releases/tag/v1.0))

Risk Level: Low
Testing: `./docs/build.sh`, `bazel build @envoy_api//envoy/...`, `bazel test //test/...`
Docs Changes: None required
Release Notes: None required

Signed-off-by: Michael Payne <michael@sooper.org>
  • Loading branch information
moderation authored and lizan committed Aug 16, 2019
1 parent 5a7bab7 commit cb15cc3
Show file tree
Hide file tree
Showing 9 changed files with 57 additions and 38 deletions.
26 changes: 25 additions & 1 deletion bazel/dependency_imports.bzl
Original file line number Diff line number Diff line change
@@ -1,12 +1,36 @@
load("@rules_foreign_cc//:workspace_definitions.bzl", "rules_foreign_cc_dependencies")
load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
load("@envoy//bazel/toolchains:rbe_toolchains_config.bzl", "rbe_toolchains_config")
load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")

# go version for rules_go
GO_VERSION = "1.12.5"
GO_VERSION = "1.12.8"

def envoy_dependency_imports(go_version = GO_VERSION):
rules_foreign_cc_dependencies()
go_rules_dependencies()
go_register_toolchains(go_version)
rbe_toolchains_config()
gazelle_dependencies()

go_repository(
name = "org_golang_google_grpc",
build_file_proto_mode = "disable",
importpath = "google.golang.org/grpc",
sum = "h1:AzbTB6ux+okLTzP8Ru1Xs41C303zdcfEht7MQnYJt5A=",
version = "v1.23.0",
)

go_repository(
name = "org_golang_x_net",
importpath = "golang.org/x/net",
sum = "h1:fHDIZ2oxGnUZRN6WgWFCbYBjH9uqVPRCUVUDhs0wnbA=",
version = "v0.0.0-20190813141303-74dc4d7220e7",
)

go_repository(
name = "org_golang_x_text",
importpath = "golang.org/x/text",
sum = "h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=",
version = "v0.3.0",
)
21 changes: 8 additions & 13 deletions bazel/repository_locations.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,9 @@ REPOSITORY_LOCATIONS = dict(
urls = ["https://github.com/bazelbuild/bazel-gazelle/releases/download/0.18.1/bazel-gazelle-0.18.1.tar.gz"],
),
bazel_toolchains = dict(
sha256 = "0710ec5a88201c4c3038ea458f7e9078cc3ad7ad61736ab287c115438eb91b1d",
strip_prefix = "bazel-toolchains-5a8611ee011d0d68498b16bf42a9c69d139bc708",
# 2019-08-01
# Need:
# - https://github.com/bazelbuild/bazel-toolchains/pull/644 to select correct toolchain from same image
# - https://github.com/bazelbuild/bazel-toolchains/pull/650 to support no java config
# TODO(lizan): Update to release when new version is released.
urls = ["https://github.com/bazelbuild/bazel-toolchains/archive/5a8611ee011d0d68498b16bf42a9c69d139bc708.tar.gz"],
sha256 = "b72e7a911436b2900b05759a1fcd735070edbd4442f0a3506ef021fdcd6e15b3",
strip_prefix = "bazel-toolchains-0.28.5",
urls = ["https://github.com/bazelbuild/bazel-toolchains/archive/0.28.5.tar.gz"],
),
boringssl = dict(
# Use commits from branch "chromium-stable-with-bazel"
Expand Down Expand Up @@ -219,8 +214,8 @@ REPOSITORY_LOCATIONS = dict(
urls = ["https://github.com/grpc-ecosystem/grpc-httpjson-transcoding/archive/64d6ac985360b624d8e95105701b64a3814794cd.tar.gz"],
),
io_bazel_rules_go = dict(
sha256 = "a82a352bffae6bee4e95f68a8d80a70e87f42c4741e6a448bec11998fcc82329",
urls = ["https://github.com/bazelbuild/rules_go/releases/download/0.18.5/rules_go-0.18.5.tar.gz"],
sha256 = "96b1f81de5acc7658e1f5a86d7dc9e1b89bc935d83799b711363a748652c471a",
urls = ["https://github.com/bazelbuild/rules_go/releases/download/0.19.2/rules_go-0.19.2.tar.gz"],
),
rules_foreign_cc = dict(
sha256 = "c957e6663094a1478c43330c1bbfa71afeaf1ab86b7565233783301240c7a0ab",
Expand All @@ -239,9 +234,9 @@ REPOSITORY_LOCATIONS = dict(
urls = ["https://github.com/census-instrumentation/opencensus-cpp/archive/cad0d03ff3474cf14389fc249e16847ab7b6895f.tar.gz"],
),
com_github_curl = dict(
sha256 = "821aeb78421375f70e55381c9ad2474bf279fc454b791b7e95fc83562951c690",
strip_prefix = "curl-7.65.1",
urls = ["https://github.com/curl/curl/releases/download/curl-7_65_1/curl-7.65.1.tar.gz"],
sha256 = "4376ac72b95572fb6c4fbffefb97c7ea0dd083e1974c0e44cd7e49396f454839",
strip_prefix = "curl-7.65.3",
urls = ["https://github.com/curl/curl/releases/download/curl-7_65_3/curl-7.65.3.tar.gz"],
),
com_googlesource_quiche = dict(
# Static snapshot of https://quiche.googlesource.com/quiche/+archive/2a930469533c3b541443488a629fe25cd8ff53d0.tar.gz
Expand Down
4 changes: 2 additions & 2 deletions ci/build_container/build_container_common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ if [[ "$(uname -m)" == "x86_64" ]]; then
&& chmod +x /usr/local/bin/buildifier

# bazelisk
VERSION=0.0.8
SHA256=5fced4fec06bf24beb631837fa9497b6698f34041463d9188610dfa7b91f4f8d
VERSION=1.0
SHA256=820f1432bb729cf1d51697a64ce57c0cff7ea4013acaf871b8c24b6388174d0d
curl --location --output /usr/local/bin/bazel https://github.com/bazelbuild/bazelisk/releases/download/v${VERSION}/bazelisk-linux-amd64 \
&& echo "$SHA256 /usr/local/bin/bazel" | sha256sum --check \
&& chmod +x /usr/local/bin/bazel
Expand Down
4 changes: 2 additions & 2 deletions ci/verify_examples.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ cd ../

# Test grpc bridge example
# install go
curl -O https://storage.googleapis.com/golang/go1.7.1.linux-amd64.tar.gz
tar -xf go1.7.1.linux-amd64.tar.gz
curl -O https://storage.googleapis.com/golang/go1.12.8.linux-amd64.tar.gz
tar -xf go1.12.8.linux-amd64.tar.gz
sudo mv go /usr/local
export PATH=$PATH:/usr/local/go/bin
export GOPATH=$HOME/go
Expand Down
26 changes: 13 additions & 13 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
GitPython==2.0.8
GitPython==3.0.0
Jinja2==2.10.1
MarkupSafe==1.1.1
Pygments==2.2.0
alabaster==0.7.10
babel==2.4.0
docutils==0.14
Pygments==2.4.2
alabaster==0.7.12
babel==2.7.0
docutils==0.15.2
gitdb==0.6.4
imagesize==0.7.1
pytz==2017.2
requests>=2.20.0
six==1.10.0
imagesize==1.1.0
pytz==2019.2
requests>=2.22.0
six==1.12.0
smmap==0.9.0
snowballstemmer==1.2.1
sphinx==1.8.1
sphinxcontrib-httpdomain==1.6.1
sphinx_rtd_theme==0.4.2
snowballstemmer==1.9.0
sphinx==2.1.2
sphinxcontrib-httpdomain==1.7.0
sphinx_rtd_theme==0.4.3
4 changes: 2 additions & 2 deletions examples/grpc-bridge/client/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
requests>=2.20.0
requests>=2.22.0
grpcio
protobuf==3.7.1
protobuf==3.8.0
4 changes: 2 additions & 2 deletions tools/deprecate_features/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
GitPython==2.1.9
PyGithub==1.38
GitPython==3.0.0
PyGithub==1.43.8
4 changes: 2 additions & 2 deletions tools/deprecate_version/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
GitPython==2.1.9
PyGithub==1.38
GitPython==3.0.0
PyGithub==1.43.8
2 changes: 1 addition & 1 deletion tools/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
flake8==3.7.7
flake8==3.7.8
yapf==0.28.0

0 comments on commit cb15cc3

Please sign in to comment.