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

[20679] Run Github Ubuntu CI on PRs (backport #4598) #4602

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 22, 2024

Description

This PR:

  1. Enables running Github Ubuntu CI on pull_request events.
  2. Fixes hidden overloads erroneously left out by [20592] Fix hidden overloaded virtual methods #4516
  3. Enables running Github CI on PRs targeting intermediate branches (not master).

@Mergifyio backport 2.13.x 2.10.x 2.6.x

Contributor Checklist

  • Commit messages follow the project guidelines.

  • 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.

  • Changes are ABI compatible.

  • Changes are API compatible.

  • N/A: New feature has been added to the versions.md file (if applicable).

  • N/A: 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.
  • 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 #4598 done by [Mergify](https://mergify.com).

* Refs #20679: Run Github Ubuntu CI on PRs

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

* Refs #20679: Fix remaining hidden overloads

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

* Refs #20679: Run CI on PRs to intermediate branches

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

---------

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

# Conflicts:
#	.github/workflows/address-sanitizers.yaml
#	.github/workflows/documentation-tests.yaml
#	.github/workflows/mac-ci.yml
#	.github/workflows/thread-sanitizer.yaml
#	.github/workflows/windows-ci.yml
#	src/cpp/fastdds/domain/DomainParticipantImpl.hpp
#	src/cpp/statistics/rtps/monitor-service/MonitorServiceListener.hpp
#	test/blackbox/common/BlackboxTestsDiscovery.cpp
Copy link
Contributor Author

mergify bot commented Mar 22, 2024

Cherry-pick of 7154a57 has failed:

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

You are currently cherry-picking commit 7154a57a0.
  (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/ubuntu-ci.yml
	modified:   include/fastrtps/subscriber/SubscriberHistory.h
	modified:   src/cpp/fastdds/publisher/DataWriterImpl.hpp
	modified:   src/cpp/fastdds/subscriber/DataReaderImpl.hpp
	modified:   src/cpp/fastrtps_deprecated/participant/ParticipantImpl.h
	modified:   src/cpp/fastrtps_deprecated/publisher/PublisherImpl.h
	modified:   src/cpp/fastrtps_deprecated/subscriber/SubscriberImpl.h
	modified:   src/cpp/rtps/DataSharing/ReaderPool.hpp
	modified:   src/cpp/rtps/DataSharing/WriterPool.hpp
	modified:   src/cpp/rtps/builtin/discovery/participant/PDPClient.h
	modified:   src/cpp/rtps/builtin/discovery/participant/PDPServer.hpp
	modified:   src/cpp/rtps/history/BasicPayloadPool_impl/Base.hpp
	modified:   src/cpp/rtps/history/BasicPayloadPool_impl/PreallocatedWithRealloc.hpp
	modified:   src/cpp/rtps/history/TopicPayloadPool_impl/Dynamic.hpp
	modified:   src/cpp/rtps/history/TopicPayloadPool_impl/DynamicReusable.hpp
	modified:   src/cpp/rtps/history/TopicPayloadPool_impl/Preallocated.hpp
	modified:   src/cpp/rtps/history/TopicPayloadPool_impl/PreallocatedWithRealloc.hpp
	modified:   src/cpp/rtps/transport/TCPTransportInterface.h
	modified:   src/cpp/rtps/transport/UDPTransportInterface.h
	modified:   src/cpp/rtps/transport/shared_mem/SharedMemTransport.h

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   .github/workflows/address-sanitizers.yaml
	both modified:   .github/workflows/documentation-tests.yaml
	both modified:   .github/workflows/mac-ci.yml
	both modified:   .github/workflows/thread-sanitizer.yaml
	both modified:   .github/workflows/windows-ci.yml
	both modified:   src/cpp/fastdds/domain/DomainParticipantImpl.hpp
	deleted by us:   src/cpp/statistics/rtps/monitor-service/MonitorServiceListener.hpp
	both modified:   test/blackbox/common/BlackboxTestsDiscovery.cpp

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 Mar 22, 2024
@mergify mergify bot mentioned this pull request Mar 22, 2024
10 tasks
@JesusPoderoso JesusPoderoso added this to the v2.6.8 milestone Mar 22, 2024
@Mario-DL
Copy link
Member

@EduPonz would you mind taking a look at this ?

@EduPonz
Copy link

EduPonz commented Mar 26, 2024

@EduPonz EduPonz closed this Mar 26, 2024
@mergify mergify bot deleted the mergify/bp/2.6.x/pr-4598 branch March 26, 2024 09:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts Backport PR wich git cherry pick failed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants