Skip to content

[23706] Update fallback branches to use environment variables (backport #6039)#6042

Merged
MiguelCompany merged 2 commits into3.3.xfrom
mergify/bp/3.3.x/pr-6039
Sep 17, 2025
Merged

[23706] Update fallback branches to use environment variables (backport #6039)#6042
MiguelCompany merged 2 commits into3.3.xfrom
mergify/bp/3.3.x/pr-6039

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Sep 17, 2025

Description

Improve management of related versions by ensuring that fallback_branch: is always assigned from either inputs or environment.

@Mergifyio backport 3.3.x 3.2.x 2.14.x

Note: Remember to update related branches in the backports

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.

  • 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.
  • N/A If this is a critical bug fix, backports to the critical-only supported branches have been requested.
  • N/A Check CI results: changes do not issue any warning.
  • N/A Check CI results: failing tests are unrelated with the changes.

This is an automatic backport of pull request #6039 done by [Mergify](https://mergify.com).

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 50ff229)

# Conflicts:
#	.github/workflows/reusable-ubuntu-ci.yml
@mergify
Copy link
Contributor Author

mergify bot commented Sep 17, 2025

Cherry-pick of 50ff229 has failed:

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

You are currently cherry-picking commit 50ff2296.
  (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:   .github/workflows/reusable-ubuntu-ci.yml

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 Sep 17, 2025
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany MiguelCompany added no-test Skip CI tests if PR marked with this label and removed conflicts Backport PR wich git cherry pick failed labels Sep 17, 2025
@MiguelCompany MiguelCompany self-requested a review September 17, 2025 13:26
@github-actions github-actions bot added the ci-pending PR which CI is running label Sep 17, 2025
@MiguelCompany MiguelCompany added this to the v3.3.1 milestone Sep 17, 2025
@MiguelCompany MiguelCompany merged commit a9855e5 into 3.3.x Sep 17, 2025
14 of 18 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/3.3.x/pr-6039 branch September 17, 2025 14: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.

1 participant