Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Nov 12, 2025

Description

The GitHub hosted runners for macos 13 are in deprecation process (see announcement), so we should update to the next one.

@Mergifyio backport 3.3.x 3.2.x 2.14.x 2.6.x

Contributor Checklist

  • Commit messages follow the project guidelines.
  • N/A: The code follows the style guidelines of this project.
  • N/A: Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally
  • N/A: Any new/modified methods have been properly documented using Doxygen.
  • N/A: Any new configuration API has an equivalent XML API (with the corresponding XSD extension)
  • Changes are backport compatible: they do NOT break ABI nor change library core behavior.
  • Changes are API compatible.
  • New feature has been added to the versions.md file (if applicable).
  • New feature has been documented/Current behavior is correctly described in the documentation.
  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • N/A: If this is a critical bug fix, backports to the critical-only supported branches have been requested.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

This is an automatic backport of pull request #6070 done by [Mergify](https://mergify.com).

* 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
@mergify
Copy link
Contributor Author

mergify bot commented Nov 12, 2025

Cherry-pick of 9ecbd27 has failed:

On branch mergify/bp/2.14.x/pr-6070
Your branch is up to date with 'origin/2.14.x'.

You are currently cherry-picking commit 9ecbd27a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/reusable-mac-ci.yml
	both modified:   PLATFORM_SUPPORT.md
	both modified:   test/blackbox/common/DDSBlackboxTestsPersistence.cpp
	both modified:   test/unittest/dds/publisher/DataWriterTests.cpp

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Nov 12, 2025
@mergify mergify bot mentioned this pull request Nov 12, 2025
11 tasks
@MiguelCompany MiguelCompany added this to the v2.14.6 milestone Nov 12, 2025
@MiguelCompany MiguelCompany removed the conflicts Backport PR wich git cherry pick failed label Nov 12, 2025
@MiguelCompany MiguelCompany requested review from MiguelCompany and removed request for richiprosima November 12, 2025 07:48
@github-actions github-actions bot added the ci-pending PR which CI is running label Nov 12, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Nov 12, 2025

🧪 CI Insights

Here's what we observed from your CI run for 4a27e18.

❌ Job Failures

Pipeline Job Health on 2.14.x Retries 🔍 CI Insights 📄 Logs
Fast-DDS MacOS CI mac-ci / fastdds_test () Unknown 0 View View

@emiliocuestaf emiliocuestaf added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels Nov 13, 2025
@juanlofer-eprosima juanlofer-eprosima merged commit a2e81ce into 2.14.x Nov 13, 2025
26 of 28 checks passed
@juanlofer-eprosima juanlofer-eprosima deleted the mergify/bp/2.14.x/pr-6070 branch November 13, 2025 06:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants