Skip to content

[20411] Migrate to eProsima-CI (backport #195)#198

Merged
EduPonz merged 3 commits into1.0.xfrom
mergify/bp/1.0.x/pr-195
Feb 19, 2024
Merged

[20411] Migrate to eProsima-CI (backport #195)#198
EduPonz merged 3 commits into1.0.xfrom
mergify/bp/1.0.x/pr-195

Conversation

@mergify
Copy link
Copy Markdown

@mergify mergify Bot commented Feb 18, 2024

This is an automatic backport of pull request #195 done by Mergify.
Cherry-pick of c045c23 has failed:

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

You are currently cherry-picking commit c045c23.
  (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/rm <file>..." as appropriate to mark resolution)
	both modified:   .github/workflows/fastcdr-test.yml
	deleted by us:   cmake/testing/GoogleTest.cmake

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 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 label Feb 18, 2024
@mergify mergify Bot mentioned this pull request Feb 18, 2024
* Refs #20423: Migrate to eProsima-CI and add Windows 2019 run

Signed-off-by: EduPonz <[email protected]>

* Refs #20423: Require CMake 3.22 for testing

Signed-off-by: EduPonz <[email protected]>

* Refs #20423: Add a test summary step

Signed-off-by: EduPonz <[email protected]>

* Refs #20423: Set v0 version for eProsima-CI actions

Signed-off-by: EduPonz <[email protected]>

---------

Signed-off-by: EduPonz <[email protected]>
(cherry picked from commit c045c23)

# Conflicts:
#	.github/workflows/fastcdr-test.yml
#	cmake/testing/GoogleTest.cmake
Signed-off-by: EduPonz <[email protected]>
@EduPonz EduPonz force-pushed the mergify/bp/1.0.x/pr-195 branch from be6e5eb to 15f4831 Compare February 18, 2024 13:01
Signed-off-by: EduPonz <[email protected]>
@EduPonz EduPonz force-pushed the mergify/bp/1.0.x/pr-195 branch from 15f4831 to 7f68fdd Compare February 18, 2024 13:04
@EduPonz EduPonz added needs-review Mark this PR as ready to be reviewed and removed conflicts labels Feb 18, 2024
Comment thread cmake/testing/GoogleTest.cmake Outdated
@EduPonz EduPonz removed the needs-review Mark this PR as ready to be reviewed label Feb 19, 2024
Copy link
Copy Markdown
Contributor

@JLBuenoLopez JLBuenoLopez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@EduPonz EduPonz merged commit d0b09bd into 1.0.x Feb 19, 2024
@EduPonz EduPonz deleted the mergify/bp/1.0.x/pr-195 branch February 19, 2024 18:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants