Skip to content

[23750] Upgrade to macOS Sequoia (backport #6070) #6166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 12, 2025
+16 −39
Merged

[23750] Upgrade to macOS Sequoia (backport #6070) #6166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions .github/workflows/reusable-mac-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,16 @@ on:
type: boolean
default: false

env:
test_blocklist: 'InterfaceWhitelist|send_to_allowed_interface|v6'

defaults:
run:
shell: bash

jobs:
reusable-mac-ci:
# As explained in https://github.com/actions/runner-images/tree/main?tab=readme-ov-file#available-images,
# *-latest images are not always the latest available versions. The minimum version of the macOS image
# with clang 15 is macos-13 (see
# https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md#language-and-runtime),
# so we'll use that one for now, as clang 15 is the supported compiler for Fast DDS in macOS.
# (see https://github.com/eProsima/Fast-DDS/blob/master/PLATFORM_SUPPORT.md#compilers)
runs-on: macos-13
runs-on: macos-15-intel
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -138,7 +135,9 @@ jobs:
colcon_meta_file: ${{ github.workspace }}/src/fastrtps/.github/workflows/config/fastdds_test.meta
colcon_test_args: ${{ inputs.colcon-args }}
colcon_test_args_default: --event-handlers=console_direct+
ctest_args: ${{ inputs.ctest-args }}
ctest_args: >
${{ inputs.ctest-args }}
${{ format('-E "{0}"', env.test_blocklist) }}
packages_names: fastrtps
workspace: ${{ github.workspace }}
test_report_artifact: ${{ format('test_report_{0}_{1}_{2}', inputs.label, github.job, join(matrix.*, '_')) }}
Expand Down
14 changes: 7 additions & 7 deletions PLATFORM_SUPPORT.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ Community members may provide assistance with these platforms.

## Platforms

|Architecture|Ubuntu Focal (20.04)|MacOS Mojave (10.14)|Windows 10 (VS2019)|Debian Buster (10)|
|------------|--------------------|--------------------|-------------------|------------------|
|amd64 |Tier 1 [^a][^s] |Tier 1 [^s] |Tier 1 [^a][^s] |Tier 3 [^s] |
|amd32 | | |Tier 2 [^a][^s] | |
|arm64 |Tier 1 [^a][^s] | | |Tier 3 [^s] |
|arm32 |Tier 3 [^s] | | |Tier 3 [^s] |
|Architecture|Ubuntu Focal (20.04)|MacOS Sequoia (15)|Windows 10 (VS2019)|Debian Buster (10)|
|------------|--------------------|------------------|-------------------|------------------|
|amd64 |Tier 1 [^a][^s] |Tier 1 [^s] |Tier 1 [^a][^s] |Tier 3 [^s] |
|amd32 | | |Tier 2 [^a][^s] | |
|arm64 |Tier 1 [^a][^s] | | |Tier 3 [^s] |
|arm32 |Tier 3 [^s] | | |Tier 3 [^s] |

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

* GCC 9
* Clang 12
* Clang 16
* MSVC v142 (Visual Studio 2019)

Tier 2 compilers:
Expand Down
24 changes: 1 addition & 23 deletions test/blackbox/common/DDSBlackboxTestsPersistence.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,16 +369,6 @@ TEST_P(PersistenceLargeData, PubSubAsReliablePubPersistentWithStaticDiscovery)
R_UNICAST_PORT_RANDOM_NUMBER_STR = "7421";
}
int32_t R_UNICAST_PORT_RANDOM_NUMBER = stoi(R_UNICAST_PORT_RANDOM_NUMBER_STR);
value = std::getenv("MULTICAST_PORT_RANDOM_NUMBER");
if (value != nullptr)
{
MULTICAST_PORT_RANDOM_NUMBER_STR = value;
}
else
{
MULTICAST_PORT_RANDOM_NUMBER_STR = "7400";
}
int32_t MULTICAST_PORT_RANDOM_NUMBER = stoi(MULTICAST_PORT_RANDOM_NUMBER_STR);

PubSubWriter<HelloWorldPubSubType> writer(TEST_TOPIC_NAME);

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

LocatorList_t WriterMulticastLocators;

LocatorBuffer.port = static_cast<uint16_t>(MULTICAST_PORT_RANDOM_NUMBER);
WriterMulticastLocators.push_back(LocatorBuffer);

writer
.history_kind(eprosima::fastrtps::KEEP_ALL_HISTORY_QOS)
.reliability(eprosima::fastrtps::RELIABLE_RELIABILITY_QOS)
.make_persistent(db_file_name(), "78.73.69.74.65.72.5f.70.65.72.73.5f|67.75.69.1")
.static_discovery("file://PubSubWriterPersistence.xml")
.unicastLocatorList(WriterUnicastLocators)
.multicastLocatorList(WriterMulticastLocators)
.setPublisherIDs(1, 2)
.setManualTopicName(std::string("BlackBox_StaticDiscovery_") + TOPIC_RANDOM_NUMBER)
.userData({'V', 'G', 'W', 0x78, 0x73, 0x69, 0x74, 0x65, 0x72, 0x5f, 0x70, 0x65, 0x72, 0x73, 0x5f, 0x67,
Expand All @@ -417,19 +401,13 @@ TEST_P(PersistenceLargeData, PubSubAsReliablePubPersistentWithStaticDiscovery)
LocatorBuffer.port = static_cast<uint16_t>(R_UNICAST_PORT_RANDOM_NUMBER);
ReaderUnicastLocators.push_back(LocatorBuffer);

LocatorList_t ReaderMulticastLocators;

LocatorBuffer.port = static_cast<uint16_t>(MULTICAST_PORT_RANDOM_NUMBER);
ReaderMulticastLocators.push_back(LocatorBuffer);

reader
.history_kind(eprosima::fastrtps::KEEP_LAST_HISTORY_QOS)
.history_depth(10)
.reliability(eprosima::fastrtps::RELIABLE_RELIABILITY_QOS)
.make_persistent(db_file_name(), "78.73.69.74.65.72.5f.70.65.72.73.5f|67.75.69.3")
.static_discovery("file://PubSubReaderPersistence.xml")
.unicastLocatorList(ReaderUnicastLocators)
.multicastLocatorList(ReaderMulticastLocators)
.setSubscriberIDs(3, 4)
.setManualTopicName(std::string("BlackBox_StaticDiscovery_") + TOPIC_RANDOM_NUMBER)
.init();
Expand All @@ -450,7 +428,7 @@ TEST_P(PersistenceLargeData, PubSubAsReliablePubPersistentWithStaticDiscovery)

reader.startReception(unreceived_data);

// Wait expecting not receiving data.
// Wait expecting receiving data.
ASSERT_EQ(10u, reader.block_for_all(std::chrono::seconds(1)));


Expand Down
2 changes: 1 addition & 1 deletion test/unittest/dds/publisher/DataWriterTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -731,7 +731,7 @@ TEST(DataWriterTests, Write)
data.message("HelloWorld");
ASSERT_TRUE(datawriter->write(&data, fastrtps::rtps::c_InstanceHandle_Unknown) ==
ReturnCode_t::RETCODE_OK);
ASSERT_TRUE(datawriter->write(&data, participant->get_instance_handle()) ==
ASSERT_TRUE(datawriter->write(&data, datawriter->get_instance_handle()) ==
ReturnCode_t::RETCODE_PRECONDITION_NOT_MET);

ASSERT_TRUE(publisher->delete_datawriter(datawriter) == ReturnCode_t::RETCODE_OK);
Expand Down
Loading