From d89a976729d9e6bbbd2e19cda39a9efb97b88295 Mon Sep 17 00:00:00 2001 From: Marcelo Zimbres Date: Sat, 4 Nov 2023 19:21:18 +0100 Subject: [PATCH] Build gcc11 builds in container. --- .github/workflows/ci.yml | 8 ++++++-- test/test_conn_echo_stress.cpp | 6 +++--- test/test_conn_push.cpp | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3cb988e7..f367c9eb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -134,13 +134,15 @@ jobs: - toolset: gcc-11 install: g++-11 os: ubuntu-latest + container: ubuntu:22.04 cxxstd: '17' build-type: 'Debug' ldflags: '' - toolset: gcc-11 install: g++-11 - os: ubuntu-22.04 + os: ubuntu-latest + container: ubuntu:22.04 cxxstd: '20' build-type: 'Release' ldflags: '' @@ -177,7 +179,7 @@ jobs: build-type: 'Release' ldflags: '' - - toolset: clang-14, + - toolset: clang-14 install: 'clang-14 libc++-14-dev libc++abi-14-dev' os: ubuntu-latest container: ubuntu:22.04 @@ -283,6 +285,8 @@ jobs: - toolset: gcc-11 install: g++-11 cxxstd: "11,17,20" # Having C++11 shouldn't break the build + os: ubuntu-latest + container: ubuntu:22.04 - toolset: clang-14 install: clang-14 os: ubuntu-latest diff --git a/test/test_conn_echo_stress.cpp b/test/test_conn_echo_stress.cpp index 0321481f..b52425ce 100644 --- a/test/test_conn_echo_stress.cpp +++ b/test/test_conn_echo_stress.cpp @@ -91,14 +91,14 @@ auto async_echo_stress(std::shared_ptr conn) -> net::awaitable // Number of coroutines that will send pings sharing the same // connection to redis. - int const sessions = 1000; + int const sessions = 500; // The number of pings that will be sent by each session. - int const msgs = 500; + int const msgs = 250; // The number of publishes that will be sent by each session with // each message. - int const n_pubs = 100; + int const n_pubs = 50; // This is the total number of pushes we will receive. int total_pushes = sessions * msgs * n_pubs + 1; diff --git a/test/test_conn_push.cpp b/test/test_conn_push.cpp index 07e9957c..b87798d6 100644 --- a/test/test_conn_push.cpp +++ b/test/test_conn_push.cpp @@ -319,7 +319,7 @@ BOOST_AUTO_TEST_CASE(many_subscribers) conn->async_exec(req0, ignore, c0); - run(conn, {}, {}); + run(conn, make_test_config(), {}); net::co_spawn(ioc.get_executor(), push_consumer3(conn), net::detached); ioc.run();