Closed mergify[bot] closed 4 months ago
Cherry-pick of d912d11bc7f1cbf9e89cc47b7053e701ec279e3c has failed:
On branch mergify/bp/2.5.x/pr-365
Your branch is up to date with 'origin/2.5.x'.
You are currently cherry-picking commit d912d11.
(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:
new file: .github/workflows/config/test.repos
new file: .github/workflows/nightly-ubuntu-ci.yml
new file: .github/workflows/reusable-ubuntu-ci.yml
new file: .github/workflows/ubuntu-ci.yml
new file: RELEASE_SUPPORT.md
Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution)
deleted by them: .github/actions/fetch-fastddsgen-repos/action.yml
deleted by us: .github/workflows/config/build.meta
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
@mergifyio rebase
rebase
Description
This PR improves the CI workflows, making them as similar as possible to the Fast DDS workflows. It also introduces a braching model refactor, similiar as the performed in Fast DDS repository.
Note: While backporting this PR, please ensure the following changes:
ubuntu-ci.yml
file with the proper fallback branchesfastdds.repos
tofastrtps.repos
ubuntu-20.04
, and only jdk11@Mergifyio backport 3.3.x 3.2.x 2.5.x 2.1.x
Contributor Checklist
[x] Commit messages follow the project guidelines.
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 New feature has been documented/Current behavior is correctly described in the documentation.
[x] Applicable backports have been included in the description.
Reviewer Checklist
This is an automatic backport of pull request #365 done by Mergify.