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

[21364] Remove double // in some installation paths (backport #5111) #5129

Merged
merged 1 commit into from
Sep 24, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 5, 2024

Description

Some installation paths contained a //, this PR fixes those, even though they are not harmful.

@Mergifyio backport 2.14.x

IMPORTANT: Same change needs to be backported to 2.10.x, but it'd be easier from the 2.14.x PR.

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)

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

  • 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.
  • If this is a critical bug fix, backports to the critical-only supported branches have been requested.
  • 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 #5111 done by [Mergify](https://mergify.com).

Copy link
Contributor Author

mergify bot commented Aug 5, 2024

Cherry-pick of 8c477dc has failed:

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

You are currently cherry-picking commit 8c477dce1.
  (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 <file>..." to mark resolution)
	both modified:   CMakeLists.txt

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 mergify bot added the conflicts Backport PR wich git cherry pick failed label Aug 5, 2024
@JesusPoderoso JesusPoderoso added this to the v2.14.4 milestone Aug 5, 2024
@JesusPoderoso
Copy link
Contributor

@Mergifyio backport 2.10.x

@JesusPoderoso JesusPoderoso self-assigned this Aug 5, 2024
Copy link
Contributor Author

mergify bot commented Aug 5, 2024

backport 2.10.x

✅ Backports have been created

Signed-off-by: eduponz <[email protected]>
(cherry picked from commit 8c477dc)

# Conflicts:
#	CMakeLists.txt
@JesusPoderoso JesusPoderoso removed the conflicts Backport PR wich git cherry pick failed label Sep 23, 2024
Copy link
Contributor

@JesusPoderoso JesusPoderoso left a comment

Choose a reason for hiding this comment

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

LGTM with green CI

@github-actions github-actions bot added ci-pending PR which CI is running labels Sep 23, 2024
@JesusPoderoso
Copy link
Contributor

CI issues are unrelated to the PR.
Ready to merge!

@JesusPoderoso JesusPoderoso added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels Sep 24, 2024
@MiguelCompany MiguelCompany merged commit 28a2729 into 2.14.x Sep 24, 2024
17 of 18 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/2.14.x/pr-5111 branch September 24, 2024 07:16
mergify bot added a commit that referenced this pull request Sep 24, 2024
Signed-off-by: eduponz <[email protected]>
(cherry picked from commit 8c477dc)

# Conflicts:
#	CMakeLists.txt

Co-authored-by: Eduardo Ponz Segrelles <[email protected]>
(cherry picked from commit 28a2729)
MiguelCompany pushed a commit that referenced this pull request Oct 17, 2024
Signed-off-by: eduponz <[email protected]>
(cherry picked from commit 8c477dc)

# Conflicts:
#	CMakeLists.txt

Co-authored-by: Eduardo Ponz Segrelles <[email protected]>
(cherry picked from commit 28a2729)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants