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

[21286] Improve CI workflows in master (backport #216) #218

Merged
merged 1 commit into from
Jul 11, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jul 11, 2024

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.

It is on top of (and must be merged after) this PR:

Note: While backporting this PR, please ensure the following changes:

  • Remove nightly jobs
  • Update ubuntu-ci.yml, mac-ci.yml and windows-ci.yml files with the proper fallback branches
  • Maintain reduced version of the RELEASE_SUPPORT.md (only reference to master links)
  • Create mirror job on 1.1.x brach (targetting 1.x)
  • Fast CDR 1.0.x requires building on ubuntu-20.04

@Mergifyio backport 2.2.x 1.1.x 1.0.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 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).
  • 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: CI pass and failing tests are unrelated with the changes.

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

@mergify mergify bot added the conflicts label Jul 11, 2024
Copy link
Author

mergify bot commented Jul 11, 2024

Cherry-pick of 203725d has failed:

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

You are currently cherry-picking commit 203725d.
  (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.meta
	new file:   .github/workflows/config/test.repos
	new file:   .github/workflows/mac-ci.yml
	new file:   .github/workflows/nightly-mac-ci.yml
	new file:   .github/workflows/nightly-ubuntu-ci.yml
	new file:   .github/workflows/nightly-windows-ci.yml
	new file:   .github/workflows/reusable-ci.yml
	new file:   .github/workflows/ubuntu-ci.yml
	new file:   .github/workflows/windows-ci.yml
	modified:   README.md
	new file:   RELEASE_SUPPORT.md

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .github/pull_request_template.md
	deleted by us:   .github/workflows/config/build.meta
	deleted by them: .github/workflows/fastcdr-test.yml

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 mentioned this pull request Jul 11, 2024
7 tasks
@JesusPoderoso JesusPoderoso added this to the v1.1.2 milestone Jul 11, 2024
@JesusPoderoso JesusPoderoso self-assigned this Jul 11, 2024
@JesusPoderoso JesusPoderoso self-requested a review July 11, 2024 14:38
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

* Refs #21286: Add Ubuntu CI

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #21286: Add Windows CI

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #21286: Add MacOS CI

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #21286: Remove previous job

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #21286: Update PR template

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #21286: Add missing dependency

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #21286: Fix colcon test warning

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #21286: Add RELEASE_SUPPORT.md

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #21286: Apply rev suggestions

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #21286: Fix labels

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #21286: Try to fix windows CI

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #21286: Include GitHub CI badges in readme

Signed-off-by: JesusPoderoso <[email protected]>

---------

Signed-off-by: JesusPoderoso <[email protected]>
(cherry picked from commit 203725d)
@JesusPoderoso JesusPoderoso merged commit 34bcc5b into 1.1.x Jul 11, 2024
7 checks passed
@JesusPoderoso JesusPoderoso deleted the mergify/bp/1.1.x/pr-216 branch July 11, 2024 15:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant