From c1836e29738faa10fded8c8b6a1d5b8a57be70a7 Mon Sep 17 00:00:00 2001 From: ivovk Date: Mon, 27 Sep 2021 08:11:23 +0300 Subject: [PATCH 1/7] Add CODEOWNERS --- CODEOWNERS | 1 + 1 file changed, 1 insertion(+) create mode 100644 CODEOWNERS diff --git a/CODEOWNERS b/CODEOWNERS new file mode 100644 index 0000000..ca00a44 --- /dev/null +++ b/CODEOWNERS @@ -0,0 +1 @@ +* @i-vovk @suboch From d6ae0f122064f9b1f7c4e5358663562e8eaa98ad Mon Sep 17 00:00:00 2001 From: Toshchev Andrey Date: Wed, 17 Nov 2021 14:55:26 +0300 Subject: [PATCH 2/7] change googletest GIT_TAG to main --- tests/CMakeLists.txt.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/CMakeLists.txt.in b/tests/CMakeLists.txt.in index 2ed41fb..b605e1b 100644 --- a/tests/CMakeLists.txt.in +++ b/tests/CMakeLists.txt.in @@ -5,7 +5,7 @@ project(googletest-download NONE) include(ExternalProject) ExternalProject_Add(googletest GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG master + GIT_TAG main SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-src" BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-build" CONFIGURE_COMMAND "" From bf170eea271be00aad163750fc0eab04e3b32b0a Mon Sep 17 00:00:00 2001 From: ivovk Date: Sat, 9 Oct 2021 13:27:49 +0300 Subject: [PATCH 3/7] workflow: Explicitly install openssl with brew --- .github/workflows/pull_request.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 02e2bee..0592343 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -30,6 +30,7 @@ jobs: brew install boost ln -s "$(brew --prefix llvm)/bin/clang-format" "/usr/local/bin/clang-format" ln -s "$(brew --prefix llvm)/bin/clang-tidy" "/usr/local/bin/clang-tidy" + brew install openssl # Run tests - name: Test run: .github/workflows/run.sh test From c717950137fdf303f142edf131dc52d067d4f9ce Mon Sep 17 00:00:00 2001 From: ivovk Date: Wed, 17 Nov 2021 15:54:03 +0300 Subject: [PATCH 4/7] tests/timeout: Remove time check for zero timeout --- tests/timeout.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/timeout.cpp b/tests/timeout.cpp index 4c72999..ec36a21 100644 --- a/tests/timeout.cpp +++ b/tests/timeout.cpp @@ -6,13 +6,9 @@ TYPED_TEST(ServerEnv, ConnectZeroTimeout) using client_type = typename TestFixture::client_type; // zero timeout should return immediately with timeout error - const auto start_t = std::chrono::steady_clock::now(); ASSERT_THROW_CODE(utils::make_client(this->server_endpoint, std::chrono::milliseconds(0), std::chrono::seconds(0), "localhost"), boost::asio::error::timed_out); - - const auto elapsed = std::chrono::steady_clock::now() - start_t; - EXPECT_TIME_LE(elapsed, std::chrono::milliseconds(50)); // actual time differs with sanitized builds } TEST_F(TCPServerEnv, ConnectTimeout) From 6b6f45e70a8a16784ba60f94c20c455c8e1898ff Mon Sep 17 00:00:00 2001 From: ivovk Date: Sat, 9 Oct 2021 12:17:01 +0300 Subject: [PATCH 5/7] readme: add n.suboch to maintainers list --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3ba86ff..1f1439d 100644 --- a/README.md +++ b/README.md @@ -231,4 +231,4 @@ Distibuted under **Apache License 2.0** [LICENSE](./LICENSE). You may also obtai ## Contacts Author - i.s.vovk@tinkoff.ru\ -Current maintainer - i.s.vovk@tinkoff.ru +Current maintainers - i.s.vovk@tinkoff.ru, n.suboch@tinkoff.ru From b1de6a008738a3f56fdcdb0b175cd8af4a1183e2 Mon Sep 17 00:00:00 2001 From: ivovk Date: Wed, 17 Nov 2021 15:50:55 +0300 Subject: [PATCH 6/7] connector: Fix data race for random generator --- include/stream-client/connector/impl/connector.ipp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/stream-client/connector/impl/connector.ipp b/include/stream-client/connector/impl/connector.ipp index 8bdec3c..86f183c 100644 --- a/include/stream-client/connector/impl/connector.ipp +++ b/include/stream-client/connector/impl/connector.ipp @@ -7,8 +7,8 @@ namespace { template void shuffle_vector(std::vector& v) { - static std::random_device r_device; - static std::mt19937 r_generator(r_device()); + std::random_device r_device; + std::mt19937 r_generator(r_device()); std::shuffle(v.begin(), v.end(), r_generator); } From e9f14a8e3238017fa161d405132415cf3ab44baa Mon Sep 17 00:00:00 2001 From: ivovk Date: Wed, 17 Nov 2021 16:21:00 +0300 Subject: [PATCH 7/7] Bump version up to 1.1.13 --- CHANGELOG.md | 14 ++++++++++++++ CMakeLists.txt | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8714231..58766d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,17 @@ +## 1.1.13 (2021-11-17) + +### Bug Fixes + +* connector: Fix data race for random generator +* tests/timeout: Remove time check for zero timeout + +### Misc + +* change googletest GIT_TAG to main +* workflow: Explicitly install openssl with brew +* readme: Add n.suboch to maintainers list + + ## 1.1.12 (2021-09-21) ### Bug Fixes diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e67b5b..e6249a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0 FATAL_ERROR) set(STREAMCLIENT_VERSION_MAJOR "1") set(STREAMCLIENT_VERSION_MINOR "1") -set(STREAMCLIENT_VERSION_RELEASE "12") +set(STREAMCLIENT_VERSION_RELEASE "13") set(STREAMCLIENT_SUMMARY "C++ library") set(STREAMCLIENT_REPOSITORY_URL "https://github.com/TinkoffCreditSystems/stream-client") set(STREAMCLIENT_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")