Skip to content

Commit

Permalink
Update dependencies - Go, Bazel toos, xxHash, nanopb, rules_go, curl,…
Browse files Browse the repository at this point in the history
… protobuf, Jinja, yaml-cpp, re2 (envoyproxy#8728)

Signed-off-by: Michael Payne <[email protected]>
  • Loading branch information
moderation authored and mattklein123 committed Oct 23, 2019
1 parent c62131f commit d4fa470
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 33 deletions.
2 changes: 1 addition & 1 deletion bazel/dependency_imports.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ load("@envoy_build_tools//toolchains:rbe_toolchains_config.bzl", "rbe_toolchains
load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")

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

def envoy_dependency_imports(go_version = GO_VERSION):
rules_foreign_cc_dependencies()
Expand Down
57 changes: 29 additions & 28 deletions bazel/repository_locations.bzl
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
REPOSITORY_LOCATIONS = dict(
bazel_compdb = dict(
sha256 = "bb1b812396e2ee36a50a13b03ae6833173ce643e8a4bd50731067d0b4e5c6e86",
strip_prefix = "bazel-compilation-database-0.3.5",
urls = ["https://github.com/grailbio/bazel-compilation-database/archive/0.3.5.tar.gz"],
sha256 = "801b35d996a097d223e028815fdba8667bf62bc5efb353486603d31fc2ba6ff9",
strip_prefix = "bazel-compilation-database-0.4.1",
urls = ["https://github.com/grailbio/bazel-compilation-database/archive/0.4.1.tar.gz"],
),
bazel_gazelle = dict(
sha256 = "be9296bfd64882e3c08e3283c58fcb461fa6dd3c171764fcc4cf322f60615a9b",
urls = ["https://github.com/bazelbuild/bazel-gazelle/releases/download/0.18.1/bazel-gazelle-0.18.1.tar.gz"],
sha256 = "41bff2a0b32b02f20c227d234aa25ef3783998e5453f7eade929704dcff7cd4b",
urls = ["https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.19.0/bazel-gazelle-v0.19.0.tar.gz"],
),
bazel_toolchains = dict(
sha256 = "a1e273b6159ae858f53046f5bab9678cffa82a72f0bf0c0a9e4af8fddb91209c",
Expand Down Expand Up @@ -64,9 +64,9 @@ REPOSITORY_LOCATIONS = dict(
urls = ["https://github.com/circonus-labs/libcircllhist/archive/63a16dd6f2fc7bc841bb17ff92be8318df60e2e1.tar.gz"],
),
com_github_cyan4973_xxhash = dict(
sha256 = "afa29766cfc0448ff4a1fd9f2c47e02c48d50be5b79749925d15d545008c3f81",
strip_prefix = "xxHash-0.7.1",
urls = ["https://github.com/Cyan4973/xxHash/archive/v0.7.1.tar.gz"],
sha256 = "7e93d28e81c3e95ff07674a400001d0cdf23b7842d49b211e5582d00d8e3ac3e",
strip_prefix = "xxHash-0.7.2",
urls = ["https://github.com/Cyan4973/xxHash/archive/v0.7.2.tar.gz"],
),
com_github_envoyproxy_sqlparser = dict(
sha256 = "425dfee0c4fe9aff8acf2365cde3dd2ba7fb878d2ba37562d33920e34c40c05e",
Expand Down Expand Up @@ -113,9 +113,9 @@ REPOSITORY_LOCATIONS = dict(
urls = ["https://github.com/LuaJIT/LuaJIT/archive/v2.1.0-beta3.tar.gz"],
),
com_github_nanopb_nanopb = dict(
sha256 = "5fb4dab0b7f6a239908407fe07c9d03877cd0502abb637e38c41091cb9c1d438",
strip_prefix = "nanopb-0.3.9.3",
urls = ["https://github.com/nanopb/nanopb/archive/0.3.9.3.tar.gz"],
sha256 = "cbc8fba028635d959033c9ba8d8186a713165e94a9de02a030a20b3e64866a04",
strip_prefix = "nanopb-0.3.9.4",
urls = ["https://github.com/nanopb/nanopb/archive/0.3.9.4.tar.gz"],
),
com_github_nghttp2_nghttp2 = dict(
sha256 = "25b623cd04dc6a863ca3b34ed6247844effe1aa5458229590b3f56a6d53cd692",
Expand Down Expand Up @@ -160,9 +160,9 @@ REPOSITORY_LOCATIONS = dict(
urls = ["https://github.com/madler/zlib/archive/v1.2.11.tar.gz"],
),
com_github_jbeder_yaml_cpp = dict(
sha256 = "53dcffd55f3433b379fcc694f45c54898711c0e29159a7bd02e82a3e0253bac3",
strip_prefix = "yaml-cpp-0f9a586ca1dc29c2ecb8dd715a315b93e3f40f79",
urls = ["https://github.com/jbeder/yaml-cpp/archive/0f9a586ca1dc29c2ecb8dd715a315b93e3f40f79.tar.gz"],
sha256 = "77ea1b90b3718aa0c324207cb29418f5bced2354c2e483a9523d98c3460af1ed",
strip_prefix = "yaml-cpp-yaml-cpp-0.6.3",
urls = ["https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-0.6.3.tar.gz"],
),
com_github_msgpack_msgpack_c = dict(
sha256 = "fbaa28c363a316fd7523f31d1745cf03eab0d1e1ea5a1c60aa0dffd4ce551afe",
Expand All @@ -181,9 +181,9 @@ REPOSITORY_LOCATIONS = dict(
urls = ["https://github.com/nodejs/http-parser/archive/v2.9.0.tar.gz"],
),
com_github_pallets_jinja = dict(
sha256 = "e9baab084b8d84b511c75aca98bba8585041dbe971d5476ee53d9c6eea1b58b3",
strip_prefix = "jinja-2.10.1",
urls = ["https://github.com/pallets/jinja/archive/2.10.1.tar.gz"],
sha256 = "db49236731373e4f3118af880eb91bb0aa6978bc0cf8b35760f6a026f1a9ffc4",
strip_prefix = "jinja-2.10.3",
urls = ["https://github.com/pallets/jinja/archive/2.10.3.tar.gz"],
),
com_github_pallets_markupsafe = dict(
sha256 = "222a10e3237d92a9cd45ed5ea882626bc72bc5e0264d3ed0f2c9129fa69fc167",
Expand Down Expand Up @@ -219,9 +219,9 @@ REPOSITORY_LOCATIONS = dict(
urls = ["https://github.com/google/googletest/archive/d7003576dd133856432e2e07340f45926242cc3a.tar.gz"],
),
com_google_protobuf = dict(
sha256 = "3040a5b946d9df7aa89c0bf6981330bf92b7844fd90e71b61da0c721e421a421",
strip_prefix = "protobuf-3.9.1",
urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v3.9.1/protobuf-all-3.9.1.tar.gz"],
sha256 = "7c99ddfe0227cbf6a75d1e75b194e0db2f672d2d2ea88fb06bdc83fe0af4c06d",
strip_prefix = "protobuf-3.9.2",
urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v3.9.2/protobuf-all-3.9.2.tar.gz"],
),
grpc_httpjson_transcoding = dict(
sha256 = "a447458b47ea4dc1d31499f555769af437c5d129d988ec1e13d5fdd0a6a36b4e",
Expand All @@ -230,8 +230,8 @@ REPOSITORY_LOCATIONS = dict(
urls = ["https://github.com/grpc-ecosystem/grpc-httpjson-transcoding/archive/2feabd5d64436e670084091a937855972ee35161.tar.gz"],
),
io_bazel_rules_go = dict(
sha256 = "96b1f81de5acc7658e1f5a86d7dc9e1b89bc935d83799b711363a748652c471a",
urls = ["https://github.com/bazelbuild/rules_go/releases/download/0.19.2/rules_go-0.19.2.tar.gz"],
sha256 = "842ec0e6b4fbfdd3de6150b61af92901eeb73681fd4d185746644c338f51d4c0",
urls = ["https://github.com/bazelbuild/rules_go/releases/download/v0.20.1/rules_go-v0.20.1.tar.gz"],
),
rules_foreign_cc = dict(
sha256 = "3184c244b32e65637a74213fc448964b687390eeeca42a36286f874c046bba15",
Expand Down Expand Up @@ -259,9 +259,9 @@ REPOSITORY_LOCATIONS = dict(
urls = ["https://github.com/census-instrumentation/opencensus-cpp/archive/98970f78091ae65b4a029bcf512696ba6d665cf4.tar.gz"],
),
com_github_curl = dict(
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"],
sha256 = "d0393da38ac74ffac67313072d7fe75b1fa1010eb5987f63f349b024a36b7ffb",
strip_prefix = "curl-7.66.0",
urls = ["https://github.com/curl/curl/releases/download/curl-7_66_0/curl-7.66.0.tar.gz"],
),
com_googlesource_quiche = dict(
# Static snapshot of https://quiche.googlesource.com/quiche/+archive/4abb566fbbc63df8fe7c1ac30b21632b9eb18d0c.tar.gz
Expand All @@ -271,12 +271,13 @@ REPOSITORY_LOCATIONS = dict(
com_google_cel_cpp = dict(
sha256 = "f027c551d57d38fb9f0b5e4f21a2b0b8663987119e23b1fd8dfcc7588e9a2350",
strip_prefix = "cel-cpp-d9d02b20ab85da2444dbdd03410bac6822141364",
# 2019-08-15
urls = ["https://github.com/google/cel-cpp/archive/d9d02b20ab85da2444dbdd03410bac6822141364.tar.gz"],
),
com_googlesource_code_re2 = dict(
sha256 = "38bc0426ee15b5ed67957017fd18201965df0721327be13f60496f2b356e3e01",
strip_prefix = "re2-2019-08-01",
urls = ["https://github.com/google/re2/archive/2019-08-01.tar.gz"],
sha256 = "b0382aa7369f373a0148218f2df5a6afd6bfa884ce4da2dfb576b979989e615e",
strip_prefix = "re2-2019-09-01",
urls = ["https://github.com/google/re2/archive/2019-09-01.tar.gz"],
),
# Included to access FuzzedDataProvider.h. This is compiler agnostic but
# provided as part of the compiler-rt source distribution. We can't use the
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.12.8.linux-amd64.tar.gz
tar -xf go1.12.8.linux-amd64.tar.gz
curl -O https://storage.googleapis.com/golang/go1.13.3.linux-amd64.tar.gz
tar -xf go1.13.3.linux-amd64.tar.gz
sudo mv go /usr/local
export PATH=$PATH:/usr/local/go/bin
export GOPATH=$HOME/go
Expand Down
2 changes: 1 addition & 1 deletion configs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
jinja2==2.10.1
jinja2==2.10.3
2 changes: 1 addition & 1 deletion docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
GitPython==3.0.0
Jinja2==2.10.1
Jinja2==2.10.3
MarkupSafe==1.1.1
Pygments==2.4.2
alabaster==0.7.12
Expand Down

0 comments on commit d4fa470

Please sign in to comment.