Skip to content
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.

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

[20091] Add macOS Github CI (backport #4100) #4400

Merged
merged 3 commits into from
Feb 24, 2024
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 20, 2024

This is an automatic backport of pull request #4100 done by Mergify.
Cherry-pick of 8cff0ca has failed:

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

You are currently cherry-picking commit 8cff0ca30.
  (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)

Changes to be committed:
	modified:   .github/workflows/config/default_ci.meta
	modified:   .github/workflows/config/nightly.meta
	new file:   .github/workflows/mac-ci.yml
	new file:   .github/workflows/nightly-mac-ci.yml
	new file:   .github/workflows/reusable-mac-ci.yml
	modified:   .github/workflows/reusable-windows-ci.yml
	modified:   test/blackbox/CMakeLists.txt
	modified:   thirdparty/boost/include/boost/mpl/aux_/integral_wrapper.hpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/windows-ci.yml

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 commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Feb 20, 2024
@mergify mergify bot mentioned this pull request Feb 20, 2024
5 tasks
@JesusPoderoso JesusPoderoso added this to the v2.10.4 milestone Feb 20, 2024
@EduPonz EduPonz added needs-review PR that is ready to be reviewed and removed conflicts Backport PR wich git cherry pick failed labels Feb 21, 2024
.github/workflows/nightly-mac-ci.yml Outdated Show resolved Hide resolved
.github/workflows/nightly-mac-ci.yml Outdated Show resolved Hide resolved
* Refs #20091: Add macOS Github CI

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20091: Add summary table

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20091: Remove commented step to install googletest

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20091: Add hosts for Fast DDS testing of DNS features

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20091: Fix Prepare colcon workspace step

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20091: Disable DNS hosts edit

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20091: Use CCache

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20091: Add optional flags to junit_summary.py

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20091: Use eProsima-CI

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20091: Use Fast DDS input branch

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20091: Print summary and only show failed list

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20091: Do not update brew

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20091: Do not upgrade python packages

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20091: Try to use python 3.11

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20091: Specify colcon workspace

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20091: Set workspace for colcon test

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20091: Use PR merge branch for windows and macos gh CI

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20091: Adapt to changes in eProsima-CI

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20091: Do not build with Wall

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20091: Upgrade to macos-13 to get clang 15

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20091: Do not use thirdparty

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20091: Avoid enum-constexpr-conversion warning

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20091: Correctly exclude DNS tests when necessary

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20091: Apply Jesús suggestions

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20091: Set eProsima-CI actions to v0

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

---------

Signed-off-by: EduPonz <eduardoponz@eprosima.com>
(cherry picked from commit 8cff0ca)

# Conflicts:
#	.github/workflows/windows-ci.yml
Signed-off-by: EduPonz <eduardoponz@eprosima.com>
Signed-off-by: EduPonz <eduardoponz@eprosima.com>
Signed-off-by: EduPonz <eduardoponz@eprosima.com>
@MiguelCompany MiguelCompany added ci-pending PR which CI is running and removed needs-review PR that is ready to be reviewed labels Feb 21, 2024
@EduPonz EduPonz merged commit ebe680c into 2.10.x Feb 24, 2024
3 of 11 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.10.x/pr-4100 branch February 24, 2024 06:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci-pending PR which CI is running
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants