From 0169a6a082a7c2c702450bcd9185789681588f0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dietrich=20Kr=C3=B6nke?= Date: Fri, 16 Sep 2022 17:10:47 +0200 Subject: [PATCH 1/3] iox-#1736 Use clang-fomat-15 in pre-flight-check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Dietrich Krönke --- .github/actions/install-iceoryx-deps-and-clang/action.yml | 2 ++ .github/workflows/build-test.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/actions/install-iceoryx-deps-and-clang/action.yml b/.github/actions/install-iceoryx-deps-and-clang/action.yml index 0563fcf782..a82913bf74 100644 --- a/.github/actions/install-iceoryx-deps-and-clang/action.yml +++ b/.github/actions/install-iceoryx-deps-and-clang/action.yml @@ -13,6 +13,8 @@ runs: sudo rm /usr/bin/clang sudo rm /usr/bin/clang++ sudo rm /usr/bin/clang-tidy + sudo rm /usr/bin/clang-format sudo ln -s /usr/bin/clang-15 /usr/bin/clang sudo ln -s /usr/bin/clang++-15 /usr/bin/clang++ sudo ln -s /usr/bin/clang-tidy-15 /usr/bin/clang-tidy + sudo ln -s /usr/bin/clang-format-15 /usr/bin/clang-format diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index e00b9607b6..a8b9e40cae 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -16,6 +16,8 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 + - name: Install iceoryx dependencies and clang-tidy + uses: ./.github/actions/install-iceoryx-deps-and-clang - run: ./tools/scripts/clang_format.sh check - run: ./tools/scripts/list_stl_dependencies.sh check - run: ./tools/scripts/check_test_ids.sh From 897fb5bcd5a9107376361640105f0ac16aea2548 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dietrich=20Kr=C3=B6nke?= Date: Fri, 16 Sep 2022 17:21:37 +0200 Subject: [PATCH 2/3] iox-#1736 Clang format files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Dietrich Krönke --- .../include/iceoryx_posh/internal/gateway/channel.inl | 8 ++++---- .../include/iceoryx_posh/popo/enum_trigger_type.hpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/iceoryx_posh/include/iceoryx_posh/internal/gateway/channel.inl b/iceoryx_posh/include/iceoryx_posh/internal/gateway/channel.inl index c689719fda..e00ae0a089 100644 --- a/iceoryx_posh/include/iceoryx_posh/internal/gateway/channel.inl +++ b/iceoryx_posh/include/iceoryx_posh/internal/gateway/channel.inl @@ -31,11 +31,11 @@ using ExternalTerminalPool = cxx::ObjectPool -IceoryxTerminalPool - Channel::s_iceoryxTerminals = IceoryxTerminalPool(); +IceoryxTerminalPool Channel::s_iceoryxTerminals = + IceoryxTerminalPool(); template -ExternalTerminalPool - Channel::s_externalTerminals = ExternalTerminalPool(); +ExternalTerminalPool Channel::s_externalTerminals = + ExternalTerminalPool(); template inline constexpr Channel::Channel( diff --git a/iceoryx_posh/include/iceoryx_posh/popo/enum_trigger_type.hpp b/iceoryx_posh/include/iceoryx_posh/popo/enum_trigger_type.hpp index 400bcbfa0d..538827e880 100644 --- a/iceoryx_posh/include/iceoryx_posh/popo/enum_trigger_type.hpp +++ b/iceoryx_posh/include/iceoryx_posh/popo/enum_trigger_type.hpp @@ -33,12 +33,12 @@ using EventEnumIdentifier = int64_t; /// @brief contains true when T is an event based enum, otherwise false template constexpr bool IS_EVENT_ENUM = - std::is_enum::value&& std::is_same, EventEnumIdentifier>::value; + std::is_enum::value && std::is_same, EventEnumIdentifier>::value; /// @brief contains true when T is a state based enum, otherwise false template constexpr bool IS_STATE_ENUM = - std::is_enum::value&& std::is_same, StateEnumIdentifier>::value; + std::is_enum::value && std::is_same, StateEnumIdentifier>::value; } // namespace popo } // namespace iox From 0b59b5ad3911cc2ae47bceb3c414b21c0973ee41 Mon Sep 17 00:00:00 2001 From: Mathias Kraus Date: Thu, 13 Oct 2022 12:29:50 +0200 Subject: [PATCH 3/3] iox-#1736 Update release notes --- doc/website/release-notes/iceoryx-unreleased.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/website/release-notes/iceoryx-unreleased.md b/doc/website/release-notes/iceoryx-unreleased.md index dbff517833..8f8564416f 100644 --- a/doc/website/release-notes/iceoryx-unreleased.md +++ b/doc/website/release-notes/iceoryx-unreleased.md @@ -54,6 +54,7 @@ - `gw::GatewayGeneric` sometimes terminates discovery and forward threads immediately [\#1666](https://github.com/eclipse-iceoryx/iceoryx/issues/1666) - `m_originId` in `mepoo::ChunkHeader` sometimes not set [\#1668](https://github.com/eclipse-iceoryx/iceoryx/issues/1668) - Removed `cxx::unique_ptr::reset` [\#1655](https://github.com/eclipse-iceoryx/iceoryx/issues/1655) +- CI uses outdated clang-format [\#1736](https://github.com/eclipse-iceoryx/iceoryx/issues/1736) **Refactoring:**