Closed mergify[bot] closed 3 months ago
Cherry-pick of 2d4c6acf8357f3a9316ee05670c618947b5dbbf8 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
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
[x] 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
This is an automatic backport of pull request #4989 done by Mergify.