Skip to content

Commit d540510

Browse files
MiguelCompanyMiguelCompany
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: # .github/workflows/reusable-mac-ci.yml # PLATFORM_SUPPORT.md # test/blackbox/common/DDSBlackboxTestsPersistence.cpp # test/unittest/dds/publisher/DataWriterTests.cpp
1 parent ced3b6f commit d540510

File tree

4 files changed

+16
-39
lines changed

4 files changed

+16
-39
lines changed

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,16 @@ on:
2929
type: boolean
3030
default: false
3131

32+
env:
33+
test_blocklist: 'InterfaceWhitelist|send_to_allowed_interface|v6'
34+
3235
defaults:
3336
run:
3437
shell: bash
3538

3639
jobs:
3740
reusable-mac-ci:
38-
# As explained in https://github.com/actions/runner-images/tree/main?tab=readme-ov-file#available-images,
39-
# *-latest images are not always the latest available versions. The minimum version of the macOS image
40-
# with clang 15 is macos-13 (see
41-
# https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md#language-and-runtime),
42-
# so we'll use that one for now, as clang 15 is the supported compiler for Fast DDS in macOS.
43-
# (see https://github.com/eProsima/Fast-DDS/blob/master/PLATFORM_SUPPORT.md#compilers)
44-
runs-on: macos-13
41+
runs-on: macos-15-intel
4542
strategy:
4643
fail-fast: false
4744
matrix:
@@ -138,7 +135,9 @@ jobs:
138135
colcon_meta_file: ${{ github.workspace }}/src/fastrtps/.github/workflows/config/fastdds_test.meta
139136
colcon_test_args: ${{ inputs.colcon-args }}
140137
colcon_test_args_default: --event-handlers=console_direct+
141-
ctest_args: ${{ inputs.ctest-args }}
138+
ctest_args: >
139+
${{ inputs.ctest-args }}
140+
${{ format('-E "{0}"', env.test_blocklist) }}
142141
packages_names: fastrtps
143142
workspace: ${{ github.workspace }}
144143
test_report_artifact: ${{ format('test_report_{0}_{1}_{2}', inputs.label, github.job, join(matrix.*, '_')) }}

‎PLATFORM_SUPPORT.md‎

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

3232
## Platforms
3333

34-
|Architecture|Ubuntu Focal (20.04)|MacOS Mojave (10.14)|Windows 10 (VS2019)|Debian Buster (10)|
35-
|------------|--------------------|--------------------|-------------------|------------------|
36-
|amd64 |Tier 1 [^a][^s] |Tier 1 [^s] |Tier 1 [^a][^s] |Tier 3 [^s] |
37-
|amd32 | | |Tier 2 [^a][^s] | |
38-
|arm64 |Tier 1 [^a][^s] | | |Tier 3 [^s] |
39-
|arm32 |Tier 3 [^s] | | |Tier 3 [^s] |
34+
|Architecture|Ubuntu Focal (20.04)|MacOS Sequoia (15)|Windows 10 (VS2019)|Debian Buster (10)|
35+
|------------|--------------------|------------------|-------------------|------------------|
36+
|amd64 |Tier 1 [^a][^s] |Tier 1 [^s] |Tier 1 [^a][^s] |Tier 3 [^s] |
37+
|amd32 | | |Tier 2 [^a][^s] | |
38+
|arm64 |Tier 1 [^a][^s] | | |Tier 3 [^s] |
39+
|arm32 |Tier 3 [^s] | | |Tier 3 [^s] |
4040

4141
[^a]: Binary releases are provided as a single archive per platform.
4242
[^s]: Compilation from source.
@@ -46,7 +46,7 @@ Community members may provide assistance with these platforms.
4646
Tier 1 compilers and minimum supported versions:
4747

4848
* GCC 9
49-
* Clang 12
49+
* Clang 16
5050
* MSVC v142 (Visual Studio 2019)
5151

5252
Tier 2 compilers:

‎test/blackbox/common/DDSBlackboxTestsPersistence.cpp‎

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

383373
PubSubWriter<HelloWorldPubSubType> writer(TEST_TOPIC_NAME);
384374

@@ -390,18 +380,12 @@ TEST_P(PersistenceLargeData, PubSubAsReliablePubPersistentWithStaticDiscovery)
390380
IPLocator::setIPv4(LocatorBuffer, 127, 0, 0, 1);
391381
WriterUnicastLocators.push_back(LocatorBuffer);
392382

393-
LocatorList_t WriterMulticastLocators;
394-
395-
LocatorBuffer.port = static_cast<uint16_t>(MULTICAST_PORT_RANDOM_NUMBER);
396-
WriterMulticastLocators.push_back(LocatorBuffer);
397-
398383
writer
399384
.history_kind(eprosima::fastrtps::KEEP_ALL_HISTORY_QOS)
400385
.reliability(eprosima::fastrtps::RELIABLE_RELIABILITY_QOS)
401386
.make_persistent(db_file_name(), "78.73.69.74.65.72.5f.70.65.72.73.5f|67.75.69.1")
402387
.static_discovery("file://PubSubWriterPersistence.xml")
403388
.unicastLocatorList(WriterUnicastLocators)
404-
.multicastLocatorList(WriterMulticastLocators)
405389
.setPublisherIDs(1, 2)
406390
.setManualTopicName(std::string("BlackBox_StaticDiscovery_") + TOPIC_RANDOM_NUMBER)
407391
.userData({'V', 'G', 'W', 0x78, 0x73, 0x69, 0x74, 0x65, 0x72, 0x5f, 0x70, 0x65, 0x72, 0x73, 0x5f, 0x67,
@@ -417,19 +401,13 @@ TEST_P(PersistenceLargeData, PubSubAsReliablePubPersistentWithStaticDiscovery)
417401
LocatorBuffer.port = static_cast<uint16_t>(R_UNICAST_PORT_RANDOM_NUMBER);
418402
ReaderUnicastLocators.push_back(LocatorBuffer);
419403

420-
LocatorList_t ReaderMulticastLocators;
421-
422-
LocatorBuffer.port = static_cast<uint16_t>(MULTICAST_PORT_RANDOM_NUMBER);
423-
ReaderMulticastLocators.push_back(LocatorBuffer);
424-
425404
reader
426405
.history_kind(eprosima::fastrtps::KEEP_LAST_HISTORY_QOS)
427406
.history_depth(10)
428407
.reliability(eprosima::fastrtps::RELIABLE_RELIABILITY_QOS)
429408
.make_persistent(db_file_name(), "78.73.69.74.65.72.5f.70.65.72.73.5f|67.75.69.3")
430409
.static_discovery("file://PubSubReaderPersistence.xml")
431410
.unicastLocatorList(ReaderUnicastLocators)
432-
.multicastLocatorList(ReaderMulticastLocators)
433411
.setSubscriberIDs(3, 4)
434412
.setManualTopicName(std::string("BlackBox_StaticDiscovery_") + TOPIC_RANDOM_NUMBER)
435413
.init();
@@ -450,7 +428,7 @@ TEST_P(PersistenceLargeData, PubSubAsReliablePubPersistentWithStaticDiscovery)
450428

451429
reader.startReception(unreceived_data);
452430

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

456434

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,7 @@ TEST(DataWriterTests, Write)
731731
data.message("HelloWorld");
732732
ASSERT_TRUE(datawriter->write(&data, fastrtps::rtps::c_InstanceHandle_Unknown) ==
733733
ReturnCode_t::RETCODE_OK);
734-
ASSERT_TRUE(datawriter->write(&data, participant->get_instance_handle()) ==
734+
ASSERT_TRUE(datawriter->write(&data, datawriter->get_instance_handle()) ==
735735
ReturnCode_t::RETCODE_PRECONDITION_NOT_MET);
736736

737737
ASSERT_TRUE(publisher->delete_datawriter(datawriter) == ReturnCode_t::RETCODE_OK);

0 commit comments

Comments
 (0)