Skip to content

Commit 6f2f718

Browse files
committed
- try fix CI by ts22.4.10 -> ts24.4.3
- minor pr fixes
1 parent 76c9a31 commit 6f2f718

File tree

11 files changed

+22
-22
lines changed

11 files changed

+22
-22
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "linux development environment for libcyphal",
3-
"image": "ghcr.io/opencyphal/toolshed:ts22.4.10",
3+
"image": "ghcr.io/opencyphal/toolshed:ts24.4.3",
44
"customizations": {
55
"vscode": {
66
"extensions": [

.github/workflows/sonar.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
contains(github.ref, '/issue/') ||
1616
(github.event_name == 'pull_request')
1717
runs-on: ubuntu-latest
18-
container: ghcr.io/opencyphal/toolshed:ts22.4.10
18+
container: ghcr.io/opencyphal/toolshed:ts24.4.3
1919
steps:
2020
- uses: actions/checkout@v4
2121
with:

.github/workflows/tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
contains(github.ref, '/issue/') ||
1717
(github.event_name == 'pull_request')
1818
runs-on: ubuntu-latest
19-
container: ghcr.io/opencyphal/toolshed:ts22.4.10
19+
container: ghcr.io/opencyphal/toolshed:ts24.4.3
2020
steps:
2121
- uses: actions/checkout@v4
2222
- name: Cache ext modules
@@ -47,7 +47,7 @@ jobs:
4747
contains(github.ref, '/issue/') ||
4848
(github.event_name == 'pull_request')
4949
runs-on: ubuntu-latest
50-
container: ghcr.io/opencyphal/toolshed:ts22.4.10
50+
container: ghcr.io/opencyphal/toolshed:ts24.4.3
5151
needs: [warmup]
5252
strategy:
5353
matrix:
@@ -101,7 +101,7 @@ jobs:
101101
contains(github.ref, '/issue/') ||
102102
(github.event_name == 'pull_request')
103103
runs-on: ubuntu-latest
104-
container: ghcr.io/opencyphal/toolshed:ts22.4.10
104+
container: ghcr.io/opencyphal/toolshed:ts24.4.3
105105
needs: [warmup]
106106
steps:
107107
- uses: actions/checkout@v4

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,10 @@ and manually run it.
147147

148148
### TLDR
149149
```
150-
docker pull ghcr.io/opencyphal/toolshed:ts22.4.10
150+
docker pull ghcr.io/opencyphal/toolshed:ts24.4.3
151151
git clone {this repo}
152152
cd {this repo}
153-
docker run --rm -it -v ${PWD}:/repo ghcr.io/opencyphal/toolshed:ts22.4.10
153+
docker run --rm -it -v ${PWD}:/repo ghcr.io/opencyphal/toolshed:ts24.4.3
154154
mkdir build
155155
cd build
156156
cmake ..
@@ -200,7 +200,7 @@ To ensure that the formatting matches the expectations of the CI suite,
200200
invoke Clang-Format of the correct version from the container (be sure to use the correct image tag):
201201

202202
```
203-
docker run --rm -v ${PWD}:/repo ghcr.io/opencyphal/toolshed:ts22.4.10 ./build-tools/bin/verify.py build-danger-danger-repo-clang-format-in-place
203+
docker run --rm -v ${PWD}:/repo ghcr.io/opencyphal/toolshed:ts24.4.3 ./build-tools/bin/verify.py build-danger-danger-repo-clang-format-in-place
204204
```
205205

206206
### `issue/*` and hashtag-based CI triggering

docs/examples/1_presentation/example_1_presentation_2_heartbeat_getinfo_udp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ TEST_F(Example_1_Presentation_2_Heartbeat_GetInfo_Udp, main)
176176

177177
// Bring up 'GetInfo' server.
178178
//
179-
using GetInfo_1_0 = uavcan::node::GetInfo_1_0;
179+
using uavcan::node::GetInfo_1_0;
180180
const std::string node_name{"org.opencyphal.Ex_1_Pres_2_HB_GetInfo_UDP"};
181181
std::copy_n(node_name.begin(), std::min(node_name.size(), 50UL), std::back_inserter(state.get_info_response.name));
182182
//

docs/examples/1_presentation/example_1_presentation_3_hb_getinfo_ping_linux_can.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -424,8 +424,8 @@ TEST_F(Example_1_Presentation_3_HB_GetInfo_Ping_Can, main)
424424

425425
// 7. Bring up 'GetInfo' server.
426426
//
427-
using GetInfo_1_0 = uavcan::node::GetInfo_1_0;
428-
uavcan::node::GetInfo_1_0::Response get_info_response{{&mr_}};
427+
using uavcan::node::GetInfo_1_0;
428+
GetInfo_1_0::Response get_info_response{{&mr_}};
429429
get_info_response.protocol_version.major = 1;
430430
const std::string node_name{"org.opencyphal.Ex_1_Pres_3_HB_GetInfo_Ping_CAN"};
431431
std::copy_n(node_name.begin(), std::min(node_name.size(), 50UL), std::back_inserter(get_info_response.name));

docs/examples/platform/node_helpers.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,15 @@ struct NodeHelpers
6969
TxSession& tx_session,
7070
const TxMetadata& metadata)
7171
{
72-
using traits = typename T::_traits_;
73-
using PayloadFragment = libcyphal::transport::PayloadFragment;
72+
using traits = typename T::_traits_;
73+
using libcyphal::transport::PayloadFragment;
7474

7575
std::array<std::uint8_t, traits::SerializationBufferSizeBytes> buffer{};
7676

7777
const auto data_size = serialize(value, buffer).value();
7878

7979
// NOLINTNEXTLINE
80-
const PayloadFragment fragment{reinterpret_cast<cetl::byte*>(buffer.data()), data_size};
80+
const PayloadFragment fragment{reinterpret_cast<cetl::byte*>(buffer.data()), data_size};
8181
const std::array<const PayloadFragment, 1> payload{fragment};
8282

8383
return tx_session.send(metadata, payload);

include/libcyphal/transport/can/can_transport_impl.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ class TransportImpl final : private TransportDelegate, public ICanTransport
109109
private:
110110
CETL_NODISCARD static CanardMemoryResource makeTxMemoryResource(IMedia& media_interface)
111111
{
112-
using LizardHelpers = libcyphal::transport::detail::LizardHelpers;
112+
using transport::detail::LizardHelpers;
113113

114114
// TX memory resource is used for raw bytes block allocations only.
115115
// So it has no alignment requirements.

include/libcyphal/transport/udp/udp_transport_impl.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ class TransportImpl final : private TransportDelegate, public IUdpTransport
119119
private:
120120
CETL_NODISCARD static UdpardMemoryResource makeTxMemoryResource(IMedia& media_interface)
121121
{
122-
using LizardHelpers = libcyphal::transport::detail::LizardHelpers;
122+
using transport::detail::LizardHelpers;
123123

124124
// TX memory resource is used for raw bytes block allocations only.
125125
// So it has no alignment requirements.

test/unittest/platform/test_single_threaded_executor.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
namespace
2828
{
2929

30-
using Duration = libcyphal::Duration;
31-
using TimePoint = libcyphal::TimePoint;
32-
using Callback = libcyphal::IExecutor::Callback;
33-
using Schedule = libcyphal::IExecutor::Callback::Schedule;
30+
using libcyphal::Duration;
31+
using libcyphal::TimePoint;
32+
using Callback = libcyphal::IExecutor::Callback;
33+
using Schedule = libcyphal::IExecutor::Callback::Schedule;
3434
using namespace libcyphal::platform; // NOLINT This our main concern here in the unit tests.
3535

3636
using testing::Eq;

0 commit comments

Comments
 (0)