From 45bcf1383b97cc2c96943c3ddbed0fa444583b52 Mon Sep 17 00:00:00 2001 From: Dmitry Rozhkov Date: Mon, 16 Nov 2020 19:53:32 +0200 Subject: [PATCH 1/3] deps: update Abseil library Signed-off-by: Dmitry Rozhkov --- bazel/repository_locations.bzl | 6 +++--- ci/do_ci.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index a91db6898b9c..c2f07177a60a 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -89,12 +89,12 @@ REPOSITORY_LOCATIONS_SPEC = dict( project_name = "Abseil", project_desc = "Open source collection of C++ libraries drawn from the most fundamental pieces of Google’s internal codebase", project_url = "https://abseil.io/", - version = "8f1c34a77a2ba04512b7f9cbc6013d405e6a0b31", - sha256 = "635367c5cac4bbab95d0485ba9e68fa422546b06ce050190c99be7e23aba3ce3", + version = "6b03bf543e99df9dd9028e3ab9e1f6b6534ca6c0", + sha256 = "c356c073f0322f0cd4c5f44ba764cdeaf6227635b4901d772f2ca78903961c22", strip_prefix = "abseil-cpp-{version}", urls = ["https://github.com/abseil/abseil-cpp/archive/{version}.tar.gz"], use_category = ["dataplane_core", "controlplane"], - release_date = "2020-10-17", + release_date = "2020-11-16", cpe = "N/A", ), com_github_c_ares_c_ares = dict( diff --git a/ci/do_ci.sh b/ci/do_ci.sh index 4e3de2a2f2a5..0a82f4af592f 100755 --- a/ci/do_ci.sh +++ b/ci/do_ci.sh @@ -304,7 +304,7 @@ elif [[ "$CI_TARGET" == "bazel.compile_time_options" ]]; then # Legacy codecs "--define legacy_codecs_in_integration_tests=true" should also be tested in # integration tests with asan. - bazel_with_collection test "${BAZEL_BUILD_OPTIONS[@]}" --define wasm=wavm "${COMPILE_TIME_OPTIONS[@]}" -c dbg @envoy//test/integration/... --config=clang-asan --build_tests_only + bazel_with_collection test "${BAZEL_BUILD_OPTIONS[@]}" --define wasm=wavm "${COMPILE_TIME_OPTIONS[@]}" -c dbg @envoy//test/integration/... --config=clang-asan --config=libc++ --build_tests_only # "--define log_debug_assert_in_release=enabled" must be tested with a release build, so run only # these tests under "-c opt" to save time in CI. From 372d559d1bbc554e7ed320871ca24be50a08346b Mon Sep 17 00:00:00 2001 From: Dmitry Rozhkov Date: Wed, 25 Nov 2020 13:33:32 +0200 Subject: [PATCH 2/3] revert do_ci.sh change Signed-off-by: Dmitry Rozhkov --- ci/do_ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/do_ci.sh b/ci/do_ci.sh index 0a82f4af592f..4e3de2a2f2a5 100755 --- a/ci/do_ci.sh +++ b/ci/do_ci.sh @@ -304,7 +304,7 @@ elif [[ "$CI_TARGET" == "bazel.compile_time_options" ]]; then # Legacy codecs "--define legacy_codecs_in_integration_tests=true" should also be tested in # integration tests with asan. - bazel_with_collection test "${BAZEL_BUILD_OPTIONS[@]}" --define wasm=wavm "${COMPILE_TIME_OPTIONS[@]}" -c dbg @envoy//test/integration/... --config=clang-asan --config=libc++ --build_tests_only + bazel_with_collection test "${BAZEL_BUILD_OPTIONS[@]}" --define wasm=wavm "${COMPILE_TIME_OPTIONS[@]}" -c dbg @envoy//test/integration/... --config=clang-asan --build_tests_only # "--define log_debug_assert_in_release=enabled" must be tested with a release build, so run only # these tests under "-c opt" to save time in CI. From 9e68d52cc0349f4c9325613d9d0d2c3b0c111f26 Mon Sep 17 00:00:00 2001 From: Dmitry Rozhkov Date: Wed, 25 Nov 2020 13:43:11 +0200 Subject: [PATCH 3/3] updated to the latest Abseil Signed-off-by: Dmitry Rozhkov --- bazel/repository_locations.bzl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index 2087610bc0ad..abdaa8a43206 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -89,12 +89,12 @@ REPOSITORY_LOCATIONS_SPEC = dict( project_name = "Abseil", project_desc = "Open source collection of C++ libraries drawn from the most fundamental pieces of Google’s internal codebase", project_url = "https://abseil.io/", - version = "6b03bf543e99df9dd9028e3ab9e1f6b6534ca6c0", - sha256 = "c356c073f0322f0cd4c5f44ba764cdeaf6227635b4901d772f2ca78903961c22", + version = "5d8fc9192245f0ea67094af57399d7931d6bd53f", + sha256 = "e3812f256dd7347a33bf9d93a950cf356c61c0596842ff07d8154cd415145d83", strip_prefix = "abseil-cpp-{version}", urls = ["https://github.com/abseil/abseil-cpp/archive/{version}.tar.gz"], use_category = ["dataplane_core", "controlplane"], - release_date = "2020-11-16", + release_date = "2020-11-24", cpe = "N/A", ), com_github_c_ares_c_ares = dict(