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.

Sign up for GitHub

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

Jump to bottom

[21228] Improve CI workflows in main, and branching model refactor #149

Merged
merged 21 commits into from
Jul 11, 2024
Merged

[21228] Improve CI workflows in main, and branching model refactor #149

merged 21 commits into from
Jul 11, 2024

Conversation

JesusPoderoso
Copy link
Contributor

@JesusPoderoso JesusPoderoso commented Jun 25, 2024 •
edited
Loading

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.

Backports to the supported branches will be manually opened:

Contributor Checklist

  • 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 Changes are API compatible.
  • 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: failing tests are unrelated with the changes.

@JesusPoderoso JesusPoderoso added this to the v2.0.0 milestone Jun 25, 2024
@JesusPoderoso JesusPoderoso self-assigned this Jun 25, 2024
@JesusPoderoso JesusPoderoso added the skip-ci Automatically pass CI label Jun 25, 2024
@JesusPoderoso JesusPoderoso requested review from EduPonz and removed request for EduPonz June 25, 2024 12:15
@JesusPoderoso JesusPoderoso added no-test Skip CI tests if PR marked with this label and removed skip-ci Automatically pass CI labels Jun 25, 2024
@JesusPoderoso JesusPoderoso requested review from EduPonz and removed request for EduPonz June 25, 2024 13:23
@github-actions github-actions bot added the ci-pending PR which CI is running label Jun 25, 2024
@JesusPoderoso JesusPoderoso requested review from EduPonz and removed request for EduPonz June 25, 2024 13:28
@JesusPoderoso JesusPoderoso mentioned this pull request Jun 25, 2024
Merged
6 tasks
@JesusPoderoso JesusPoderoso requested review from EduPonz and removed request for EduPonz June 25, 2024 14:03
This was referenced Jun 25, 2024
Merged
Merged
@JesusPoderoso JesusPoderoso removed the no-test Skip CI tests if PR marked with this label label Jun 25, 2024
@JesusPoderoso JesusPoderoso requested review from EduPonz and removed request for EduPonz June 25, 2024 14:43
@JesusPoderoso JesusPoderoso requested review from EduPonz and removed request for EduPonz June 25, 2024 15:12
@JesusPoderoso JesusPoderoso requested review from richiprosima and removed request for EduPonz June 26, 2024 06:05
@JesusPoderoso
Refs #21228: Deactivate Windows build temporary on 1.0.x
e9d9759 
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
@JesusPoderoso
Refs #21228: Move build documentation in tests steps only in Ubuntu CI
2cc0571 
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
@JesusPoderoso
Refs #21228: Apply rev suggestions
7c66a53 
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
@JesusPoderoso
Refs #21228: Fix test.meta issue in Ubuntu vs Windows
342e6f9 
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
@JesusPoderoso
Refs #21228: Remove test.repos
0eabeb7 
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
@JesusPoderoso
Refs #21228: Apply last rev suggestion
06ff62b 
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
@JesusPoderoso
Refs #21228: Add if conflicts check in PR trigger to avoid passing re…
236083c 
…quired CI

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
@JesusPoderoso
Refs #21228: Update eProsima-CI action references
fde37ad 
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
@JesusPoderoso
Refs #21228: Avoid building dependencies again
283ae4e 
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
@JesusPoderoso
Refs #21228: Apply rev suggestions
fcd7454 
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
@JesusPoderoso
Refs #21228: Simplify nightly removing unnecessary matrix options
557a5d8 
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
@JesusPoderoso
Refs #21228: Move 2.6.x related jobs to weekly workflow
91e1d95 
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
@JesusPoderoso
Refs #21228: Fix weekly cron expression
85f7216 
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
EduPonz
EduPonz suggested changes Jul 9, 2024
View reviewed changes
Copy link

@EduPonz EduPonz left a comment

Choose a reason for hiding this comment

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

NIT

.github/workflows/nightly-windows-ci.yml Outdated Show resolved Hide resolved
.github/workflows/nightly-windows-ci.yml Outdated Show resolved Hide resolved
.github/workflows/nightly-windows-ci.yml Outdated Show resolved Hide resolved
.github/workflows/weekly-windows-ci.yml Outdated Show resolved Hide resolved
@JesusPoderoso
Refs #21228: Apply rev suggestions
7dd2d1a 
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
@EduPonz EduPonz self-requested a review July 10, 2024 14:06
EduPonz
EduPonz previously approved these changes Jul 10, 2024
View reviewed changes
@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 Jul 10, 2024
@JesusPoderoso
Refs #21228: Apply rev suggestions
a80e8ae 
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
@EduPonz EduPonz merged commit f9575d2 into main Jul 11, 2024
2 checks passed
@EduPonz EduPonz deleted the feature/21228 branch July 11, 2024 14:09
EduPonz pushed a commit that referenced this pull request Jul 11, 2024
@JesusPoderoso
Improve CI workflows in 1.4.x, and branching model refactor (#149) (#150
16fd493 
)

* Refs #21228: Refactor Ubuntu CI

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #21228: Refactor Windows CI

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #21228: Remove previous workflow

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #21228: Add RELEASE_SUPPORT.md with Fast DDS references

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #21228: Fix windows CI removing win2017

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #21228: Apply rev suggestions in main PR

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #21228: Avoid building dependencies again

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #21228: Apply rev suggestions

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #21228: Apply rev suggestions

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

---------

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
EduPonz pushed a commit that referenced this pull request Jul 11, 2024
@JesusPoderoso
Improve CI workflows in 1.0.x, and branching model refactor (#149) (#152
5359d7c 
)

* Refs #21228: Refactor Ubuntu CI

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #21228: Refactor Windows CI

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #21228: Remove previous workflow

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #21228: Add RELEASE_SUPPORT.md with Fast DDS references

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #21228: Avoid running tests in 1.0.x

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #21228: Fix windows CI removing win2017

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #21228: Deactivate Windows build temporary

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #21228: Apply rev suggestions in main PR

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #21228: Avoid building dependencies again

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #21228: Apply rev suggestions

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #21228: Apply rev suggestions

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

---------

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@EduPonz EduPonz EduPonz approved these changes

Assignees

@JesusPoderoso JesusPoderoso

Labels
ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Milestone
v2.0.0
Development

Successfully merging this pull request may close these issues.
2 participants
@JesusPoderoso @EduPonz