From d52090f438906976c864698def2413b9d4ee097b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Korina=20=C5=A0imi=C4=8Devi=C4=87?= Date: Mon, 3 Jun 2024 09:00:30 +0200 Subject: [PATCH] Add support for g++-13,14 Summary: related to T13767, #9 fix compilation error on g++-14 add g++-13 & g++-14 workflow to CI (requires ubuntu 24.04) Reviewers: ivica Reviewed By: ivica Subscribers: miljen, iljazovic Differential Revision: https://repo.mireo.local/D29794 --- .github/workflows/ci.yml | 24 +++++++++++++++++-- .github/workflows/coverage.yml | 2 +- README.md | 4 ++-- doc/qbk/01_intro.qbk | 4 ++-- include/async_mqtt5/detail/control_packet.hpp | 1 + include/async_mqtt5/impl/re_auth_op.hpp | 1 + test/include/test_common/packet_util.hpp | 3 ++- 7 files changed, 31 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 00e86cf..b343cfd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ env: jobs: windows: - name: "${{ matrix.toolset }} std=c++${{ matrix.cxxstd }} ${{ matrix.build-type }}" + name: "${{ matrix.toolset }} std=c++${{ matrix.cxxstd }}" defaults: run: shell: cmd @@ -114,7 +114,7 @@ jobs: .\\test\\build\\${{ matrix.build-type }}\\mqtt-test.exe posix: - name: "${{ matrix.toolset }} std=c++${{ matrix.cxxstd }} ${{ matrix.build-type }}" + name: "${{ matrix.toolset }} std=c++${{ matrix.cxxstd }} ${{ matrix.container }}" defaults: run: @@ -150,6 +150,26 @@ jobs: os: ubuntu-latest container: ubuntu:22.04 build-type: 'Release' + cxxstd: 17 + cxxflags: '' + ldflags: '' + + - toolset: g++-13 + compiler: g++-13 + install: g++-13 + os: ubuntu-24.04 + container: ubuntu:24.04 + build-type: 'Release' + cxxstd: 17 + cxxflags: '' + ldflags: '' + + - toolset: g++-14 + compiler: g++-14 + install: g++-14 + os: ubuntu-24.04 + container: ubuntu:24.04 + build-type: 'Release' cxxstd: 20 cxxflags: '' ldflags: '' diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 2b41f36..048e464 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -15,7 +15,7 @@ env: jobs: posix: - name: "coverage ${{ matrix.compiler }} -std=c++${{ matrix.cxxstd }}" + name: "coverage ${{ matrix.compiler }} -std=c++${{ matrix.cxxstd }} ${{ matrix.container }}" defaults: run: shell: bash diff --git a/README.md b/README.md index 334e41f..7dcb307 100644 --- a/README.md +++ b/README.md @@ -128,8 +128,8 @@ Async.MQTT5 is a header-only library. To use Async.MQTT5 it requires the followi - **OpenSSL**. Only if you require an SSL connection by using [boost::asio::ssl::stream](https://www.boost.org/doc/libs/1_82_0/doc/html/boost_asio/reference/ssl__stream.html). Async.MQTT5 has been tested with the following compilers: -- clang 12.0, 13.0, 14.0, 15.0 (Linux) -- GCC 9, 10, 11, 12 (Linux) +- clang 12.0 - 15.0 (Linux) +- GCC 9 - 14 (Linux) - MSVC 14.37 - Visual Studio 2022 (Windows) Contributing diff --git a/doc/qbk/01_intro.qbk b/doc/qbk/01_intro.qbk index ef52334..b52c3e3 100644 --- a/doc/qbk/01_intro.qbk +++ b/doc/qbk/01_intro.qbk @@ -127,8 +127,8 @@ To use __Self__ it requires the following: __Self__ has been tested with the following compilers: -* clang 12.0, 13.0, 14.0, 15.0 (Linux) -* GCC 9, 10, 11, 12 (Linux) +* clang 12.0 - 15.0 (Linux) +* GCC 9 - 14 (Linux) * MSVC 14.37 - Visual Studio 2022 (Windows) [heading Acknowledgements] diff --git a/include/async_mqtt5/detail/control_packet.hpp b/include/async_mqtt5/detail/control_packet.hpp index 5403c11..953c8ea 100644 --- a/include/async_mqtt5/detail/control_packet.hpp +++ b/include/async_mqtt5/detail/control_packet.hpp @@ -8,6 +8,7 @@ #ifndef ASYNC_MQTT5_CONTROL_PACKET_HPP #define ASYNC_MQTT5_CONTROL_PACKET_HPP +#include #include #include diff --git a/include/async_mqtt5/impl/re_auth_op.hpp b/include/async_mqtt5/impl/re_auth_op.hpp index ef203bd..40bad8d 100644 --- a/include/async_mqtt5/impl/re_auth_op.hpp +++ b/include/async_mqtt5/impl/re_auth_op.hpp @@ -11,6 +11,7 @@ #include #include +#include #include #include diff --git a/test/include/test_common/packet_util.hpp b/test/include/test_common/packet_util.hpp index 86b9cab..616bdcb 100644 --- a/test/include/test_common/packet_util.hpp +++ b/test/include/test_common/packet_util.hpp @@ -8,8 +8,9 @@ #ifndef ASYNC_MQTT5_TEST_PACKET_UTIL_HPP #define ASYNC_MQTT5_TEST_PACKET_UTIL_HPP -#include #include +#include +#include #include