Skip to content

Commit f8c1cf7

Browse files
MiguelCompanymergify[bot]
MiguelCompany
authored and
mergify[bot]
committed
Upgrade to macOS Sequoia (#6070)
* Refs #23750. Change runner in CI. Signed-off-by: Miguel Company <[email protected]> * Refs #23750. Update platform support. Signed-off-by: Miguel Company <[email protected]> * Refs #23750. Apply suggestion. Signed-off-by: Miguel Company <[email protected]> * Refs #23750. Update to macos-15. Signed-off-by: Miguel Company <[email protected]> * Refs #23750. Do not build IPv6 blackbox tests in Mac. Signed-off-by: Miguel Company <[email protected]> * Refs #23750. Exclude whitelist tests. Signed-off-by: Miguel Company <[email protected]> * Refs #23750. Fix DataWriterTests. Signed-off-by: Miguel Company <[email protected]> * Refs #23750. Change blacklisting of IPv6 test. Signed-off-by: Miguel Company <[email protected]> * Refs #23750. Remove multicast from DDSPersistenceTests. Signed-off-by: Miguel Company <[email protected]> --------- Signed-off-by: Miguel Company <[email protected]> (cherry picked from commit 9ecbd27) # Conflicts: # PLATFORM_SUPPORT.md
1 parent 357fd4b commit f8c1cf7

File tree

4 files changed

+21
-35
lines changed

4 files changed

+21
-35
lines changed

‎.github/workflows/reusable-mac-ci.yml‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,16 @@ on:
3939
type: boolean
4040
default: true
4141

42+
env:
43+
test_blocklist: 'InterfaceWhitelist|send_to_allowed_interface|v6'
44+
4245
defaults:
4346
run:
4447
shell: bash
4548

4649
jobs:
4750
fastdds_build:
48-
# As explained in https://github.com/actions/runner-images/tree/main?tab=readme-ov-file#available-images,
49-
# *-latest images are not always the latest available versions. The minimum version of the macOS image
50-
# with clang 15 is macos-13 (see
51-
# https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md#language-and-runtime),
52-
# so we'll use that one for now, as clang 15 is the supported compiler for Fast DDS in macOS.
53-
# (see https://github.com/eProsima/Fast-DDS/blob/master/PLATFORM_SUPPORT.md#compilers)
54-
runs-on: macos-13
51+
runs-on: macos-15-intel
5552
strategy:
5653
fail-fast: false
5754
matrix:
@@ -153,7 +150,7 @@ jobs:
153150
fastdds_test:
154151
needs: fastdds_build
155152
name: fastdds_test (${{ matrix.cmake_build_type }})
156-
runs-on: macos-13
153+
runs-on: macos-15-intel
157154
strategy:
158155
fail-fast: false
159156
matrix:
@@ -225,7 +222,9 @@ jobs:
225222
colcon_meta_file: ${{ github.workspace }}/src/fastdds/.github/workflows/config/fastdds_test.meta
226223
colcon_test_args: ${{ inputs.colcon-args }}
227224
colcon_test_args_default: --event-handlers=console_direct+
228-
ctest_args: ${{ inputs.ctest-args }}
225+
ctest_args: >
226+
${{ inputs.ctest-args }}
227+
${{ format('-E "{0}"', env.test_blocklist) }}
229228
packages_names: fastdds
230229
workspace: ${{ github.workspace }}
231230
test_report_artifact: ${{ format('test_report_{0}_{1}_{2}', inputs.label, github.job, join(matrix.*, '_')) }}

‎PLATFORM_SUPPORT.md‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,21 @@ Community members may provide assistance with these platforms.
3131

3232
## Platforms
3333

34+
<<<<<<< HEAD
3435
|Architecture|Ubuntu Noble (24.04)|Ubuntu Jammy (22.04)|MacOS Mojave (10.14)|Windows 10 (VS2019)|Windows 11 (VS2022)|Debian Buster (10)|Android 12 |Android 13 | QNX 7.1 |
3536
|------------|--------------------|--------------------|--------------------|-------------------|-------------------|------------------|-----------|-----------|-----------|
3637
|amd64 |Tier 3 [^a][^s] |Tier 1 [^a][^s] |Tier 1 [^s] |Tier 3 [^a][^s] |Tier 1 [^a][^s] |Tier 3 [^s] |Tier 3 [^s]|Tier 3 [^s]|Tier 3 [^s]|
3738
|amd32 | | |Tier 3 [^a][^s] |Tier 3 [^a][^s] | | | | |
3839
|arm64 |Tier 3 [^a][^s] |Tier 1 [^a][^s] | | | |Tier 3 [^s] |Tier 3 [^s]|Tier 3 [^s]|Tier 3 [^s]|
3940
|arm32 | |Tier 3 [^s] | | | |Tier 3 [^s] |Tier 3 [^s]|Tier 3 [^s]| |
41+
=======
42+
|Architecture|Ubuntu Noble (24.04)|Ubuntu Jammy (22.04)|MacOS Sequoia (15)|Windows 10 (VS2019)|Windows 11 (VS2022)|Debian Buster (10)|Android 12 |Android 13 | QNX 7.1 |
43+
|------------|--------------------|--------------------|------------------|-------------------|-------------------|------------------|-----------|-----------|-----------|
44+
|amd64 |Tier 3 [^a][^s] |Tier 1 [^a][^s] |Tier 1 [^s] |Tier 1 [^a][^s] |Tier 1 [^a][^s] |Tier 3 [^s] |Tier 3 [^s]|Tier 3 [^s]|Tier 3 [^s]|
45+
|amd32 | | | |Tier 3 [^a][^s] |Tier 3 [^a][^s] | | | | |
46+
|arm64 |Tier 3 [^a][^s] |Tier 1 [^a][^s] | | | |Tier 3 [^s] |Tier 3 [^s]|Tier 3 [^s]|Tier 3 [^s]|
47+
|arm32 | |Tier 3 [^s] | | | |Tier 3 [^s] |Tier 3 [^s]|Tier 3 [^s]| |
48+
>>>>>>> 9ecbd27a (Upgrade to macOS Sequoia (#6070))
4049
4150
More information about Platforms support and eProsima products compatibility can be found on [Fast DDS Documentation](https://fast-dds.docs.eprosima.com/en/latest/notes/versions.html#dependencies-and-compatibilities).
4251

@@ -48,7 +57,7 @@ More information about Platforms support and eProsima products compatibility can
4857
Tier 1 compilers and minimum supported versions:
4958

5059
* GCC 11.4 [^d]
51-
* Clang 15
60+
* Clang 16
5261
* MSVC v142 (Visual Studio 2019)
5362

5463
[^d]: Using GCC's Thread Sanitizer flags in conjunction with GCC 11 to analyze Fast DDS threaded behavior produces

‎test/blackbox/common/DDSBlackboxTestsPersistence.cpp‎

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -368,16 +368,6 @@ TEST_P(DDSPersistenceTests, PubSubAsReliablePubTransientWithStaticDiscovery)
368368
R_UNICAST_PORT_RANDOM_NUMBER_STR = "7421";
369369
}
370370
int32_t R_UNICAST_PORT_RANDOM_NUMBER = stoi(R_UNICAST_PORT_RANDOM_NUMBER_STR);
371-
value = std::getenv("MULTICAST_PORT_RANDOM_NUMBER");
372-
if (value != nullptr)
373-
{
374-
MULTICAST_PORT_RANDOM_NUMBER_STR = value;
375-
}
376-
else
377-
{
378-
MULTICAST_PORT_RANDOM_NUMBER_STR = "7400";
379-
}
380-
int32_t MULTICAST_PORT_RANDOM_NUMBER = stoi(MULTICAST_PORT_RANDOM_NUMBER_STR);
381371

382372
PubSubWriter<HelloWorldPubSubType> writer(TEST_TOPIC_NAME);
383373

@@ -389,18 +379,12 @@ TEST_P(DDSPersistenceTests, PubSubAsReliablePubTransientWithStaticDiscovery)
389379
IPLocator::setIPv4(LocatorBuffer, 127, 0, 0, 1);
390380
WriterUnicastLocators.push_back(LocatorBuffer);
391381

392-
LocatorList_t WriterMulticastLocators;
393-
394-
LocatorBuffer.port = static_cast<uint16_t>(MULTICAST_PORT_RANDOM_NUMBER);
395-
WriterMulticastLocators.push_back(LocatorBuffer);
396-
397382
writer
398383
.history_kind(eprosima::fastdds::dds::KEEP_ALL_HISTORY_QOS)
399384
.reliability(eprosima::fastdds::dds::RELIABLE_RELIABILITY_QOS)
400385
.make_transient(db_file_name(), "78.73.69.74.65.72.5f.70.65.72.73.5f|67.75.69.1")
401386
.static_discovery("file://PubSubWriterPersistence_static_disc.xml")
402387
.unicastLocatorList(WriterUnicastLocators)
403-
.multicast_locator_list(WriterMulticastLocators)
404388
.setPublisherIDs(1, 2)
405389
.setManualTopicName(std::string("BlackBox_StaticDiscovery_") + TOPIC_RANDOM_NUMBER)
406390
.user_data({'V', 'G', 'W', 0x78, 0x73, 0x69, 0x74, 0x65, 0x72, 0x5f, 0x70, 0x65, 0x72, 0x73, 0x5f, 0x67,
@@ -416,19 +400,13 @@ TEST_P(DDSPersistenceTests, PubSubAsReliablePubTransientWithStaticDiscovery)
416400
LocatorBuffer.port = static_cast<uint16_t>(R_UNICAST_PORT_RANDOM_NUMBER);
417401
ReaderUnicastLocators.push_back(LocatorBuffer);
418402

419-
LocatorList_t ReaderMulticastLocators;
420-
421-
LocatorBuffer.port = static_cast<uint16_t>(MULTICAST_PORT_RANDOM_NUMBER);
422-
ReaderMulticastLocators.push_back(LocatorBuffer);
423-
424403
reader
425404
.history_kind(eprosima::fastdds::dds::KEEP_LAST_HISTORY_QOS)
426405
.history_depth(10)
427406
.reliability(eprosima::fastdds::dds::RELIABLE_RELIABILITY_QOS)
428407
.make_transient(db_file_name(), "78.73.69.74.65.72.5f.70.65.72.73.5f|67.75.69.3")
429408
.static_discovery("file://PubSubReaderPersistence_static_disc.xml")
430409
.unicastLocatorList(ReaderUnicastLocators)
431-
.multicast_locator_list(ReaderMulticastLocators)
432410
.setSubscriberIDs(3, 4)
433411
.setManualTopicName(std::string("BlackBox_StaticDiscovery_") + TOPIC_RANDOM_NUMBER)
434412
.init();
@@ -449,7 +427,7 @@ TEST_P(DDSPersistenceTests, PubSubAsReliablePubTransientWithStaticDiscovery)
449427

450428
reader.startReception(unreceived_data);
451429

452-
// Wait expecting not receiving data.
430+
// Wait expecting receiving data.
453431
ASSERT_EQ(10u, reader.block_for_all(std::chrono::seconds(1)));
454432

455433
// Destroy the DataWriter

‎test/unittest/dds/publisher/DataWriterTests.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -784,7 +784,7 @@ TEST(DataWriterTests, Write)
784784
data.message("HelloWorld");
785785
ASSERT_FALSE(datawriter->write(nullptr, HANDLE_NIL) == RETCODE_OK);
786786
ASSERT_TRUE(datawriter->write(&data, HANDLE_NIL) == RETCODE_OK);
787-
ASSERT_TRUE(datawriter->write(&data, participant->get_instance_handle()) ==
787+
ASSERT_TRUE(datawriter->write(&data, datawriter->get_instance_handle()) ==
788788
RETCODE_PRECONDITION_NOT_MET);
789789

790790
ASSERT_TRUE(publisher->delete_datawriter(datawriter) == RETCODE_OK);
@@ -825,7 +825,7 @@ TEST(DataWriterTests, WriteWithTimestamp)
825825
datawriter->write_w_timestamp(&data, HANDLE_NIL, fastdds::dds::c_TimeInvalid));
826826
// 3. Calling write with a wrong instance handle returns RETCODE_PRECONDITION_NOT_MET
827827
ASSERT_EQ(RETCODE_PRECONDITION_NOT_MET,
828-
datawriter->write_w_timestamp(&data, participant->get_instance_handle(), ts));
828+
datawriter->write_w_timestamp(&data, datawriter->get_instance_handle(), ts));
829829
// 4. Correct case
830830
ASSERT_EQ(RETCODE_OK, datawriter->write_w_timestamp(&data, HANDLE_NIL, ts));
831831

0 commit comments

Comments
 (0)