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

[21219] Build profiling tests as alternate build in Ubuntu CI (backport #4989) #4994

Merged
merged 3 commits into from
Jun 26, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 25, 2024

Description

This PR is a combination of backporting #4986 with the addition of the CI changes introduced in #4960. It enable compilation of profiling tests in Ubuntu CI.

As it only affects the alternative builds step, no-test label is added.

@Mergifyio backport 2.13.x 2.10.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)

  • N/A: Changes are backport compatible: they do NOT break ABI nor change library core behavior.

  • N/A: 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.

  • N/A: 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 [21219] Build profiling tests as alternate build in Ubuntu CI  #4989 done by Mergify.

* Refs #21219: Always build profilling tests executable if CMake option is set

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

* Refs #21219: Build profiling tests as alternate build in Ubuntu CI

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

* Refs #21219: Fix profilling tests build

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

* Refs #21219: Uncrustify

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

---------

Signed-off-by: eduponz <eduardoponz@eprosima.com>
(cherry picked from commit 2d4c6ac)

# Conflicts:
#	test/CMakeLists.txt
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Jun 25, 2024
Copy link
Contributor Author

mergify bot commented Jun 25, 2024

Cherry-pick of 2d4c6ac has failed:

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

You are currently cherry-picking commit 2d4c6acf8.
  (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/reusable-ubuntu-ci.yml
	modified:   test/profiling/CMakeLists.txt
	modified:   test/profiling/MemoryTestTypes.cpp
	modified:   test/profiling/MemoryTestTypes.h

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/CMakeLists.txt

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

@EduPonz EduPonz added this to the v2.10.5 milestone Jun 25, 2024
@JesusPoderoso JesusPoderoso added the no-test Skip CI tests if PR marked with this label label Jun 25, 2024
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany MiguelCompany self-requested a review June 26, 2024 05:28
@MiguelCompany MiguelCompany removed the conflicts Backport PR wich git cherry pick failed label Jun 26, 2024
@MiguelCompany MiguelCompany requested review from MiguelCompany and removed request for MiguelCompany June 26, 2024 05:28
@github-actions github-actions bot added the ci-pending PR which CI is running label Jun 26, 2024
MiguelCompany
MiguelCompany previously approved these changes Jun 26, 2024
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@EduPonz EduPonz merged commit eb45141 into 2.10.x Jun 26, 2024
15 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.10.x/pr-4989 branch June 26, 2024 10:47
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 no-test Skip CI tests if PR marked with this label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants