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

[19490] Fix Github windows CI #3887

Merged
merged 5 commits into from
Sep 29, 2023
Merged

[19490] Fix Github windows CI #3887

merged 5 commits into from
Sep 29, 2023

Conversation

EduPonz
Copy link

@EduPonz EduPonz commented Sep 28, 2023 •
edited
Loading

Description

This PR adds logic to the Windows CI workflow to cope with versions depending on different Fast CDR versions.

Contributor Checklist

  • Commit messages follow the project guidelines.
  • 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 ABI compatible.
  • 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.
  • N/A: Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • Check contributor checklist is correct.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

@EduPonz
Refs #19490: Fix nightly windows CI
d90c2c6 
Signed-off-by: EduPonz <eduardoponz@eprosima.com>
@EduPonz EduPonz added this to the v2.12.0 milestone Sep 28, 2023
@EduPonz
Refs #19490: Look for OpenSSL directory in several places
cc4ba58 
Signed-off-by: EduPonz <eduardoponz@eprosima.com>
@EduPonz EduPonz force-pushed the hotfix/github_windows_ci branch from bc6e89f to cc4ba58 Compare September 28, 2023 09:13
@EduPonz
Refs #19490: Fix Fast DDS branch selection
94b2c22 
Signed-off-by: EduPonz <eduardoponz@eprosima.com>
@EduPonz
Refs #19490: Defer to master if cannot find repos
ccc5133 
Signed-off-by: EduPonz <eduardoponz@eprosima.com>
MiguelCompany
MiguelCompany requested changes Sep 28, 2023
View reviewed changes
Copy link
Member

@MiguelCompany MiguelCompany left a comment

Choose a reason for hiding this comment

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

The suggestions below should also be applied to the nightly_xxx repos

.github/workflows/config/default_ci_2.6.x.repos Outdated Show resolved Hide resolved
.github/workflows/config/default_ci_2.6.x.repos Outdated Show resolved Hide resolved
.github/workflows/config/nightly_2.10.x.repos Outdated Show resolved Hide resolved
.github/workflows/config/nightly_2.10.x.repos Outdated Show resolved Hide resolved
.github/workflows/config/nightly_2.11.x.repos Outdated Show resolved Hide resolved
@EduPonz
Refs #19490: Apply Miguel's suggestions
2839b2d 
Signed-off-by: EduPonz <eduardoponz@eprosima.com>
@MiguelCompany MiguelCompany added the ci-pending PR which CI is running label Sep 29, 2023
@EduPonz EduPonz merged commit 7057142 into master Sep 29, 2023
@EduPonz EduPonz deleted the hotfix/github_windows_ci branch September 29, 2023 08:43
@EduPonz
Copy link
Author

EduPonz commented Oct 6, 2023

@Mergifyio backport 2.11.x 2.10.x 2.6.x

@mergify
Copy link
Contributor

mergify bot commented Oct 6, 2023 •
edited
Loading

backport 2.11.x 2.10.x 2.6.x

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Oct 6, 2023
@EduPonz @mergify
Fix Github windows CI (#3887)
932df68 
* Refs #19490: Fix nightly windows CI

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #19490: Look for OpenSSL directory in several places

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #19490: Fix Fast DDS branch selection

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #19490: Defer to master if cannot find repos

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #19490: Apply Miguel's suggestions

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

---------

Signed-off-by: EduPonz <eduardoponz@eprosima.com>
(cherry picked from commit 7057142)

# Conflicts:
#	.github/workflows/reusable-windows-ci.yml
@mergify mergify bot mentioned this pull request Oct 6, 2023
Closed
mergify bot pushed a commit that referenced this pull request Oct 6, 2023
@EduPonz @mergify
Fix Github windows CI (#3887)
126fe96 
* Refs #19490: Fix nightly windows CI

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #19490: Look for OpenSSL directory in several places

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #19490: Fix Fast DDS branch selection

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #19490: Defer to master if cannot find repos

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #19490: Apply Miguel's suggestions

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

---------

Signed-off-by: EduPonz <eduardoponz@eprosima.com>
(cherry picked from commit 7057142)

# Conflicts:
#	.github/workflows/asan/default_ci_2.10.x.repos
#	.github/workflows/asan/default_ci_2.11.x.repos
#	.github/workflows/asan/default_ci_2.6.x.repos
#	.github/workflows/asan/default_ci_master.repos
#	.github/workflows/asan/nightly_2.10.x.repos
#	.github/workflows/asan/nightly_2.11.x.repos
#	.github/workflows/asan/nightly_2.6.x.repos
#	.github/workflows/asan/nightly_master.repos
#	.github/workflows/nightly-windows-ci.yml
#	.github/workflows/reusable-windows-ci.yml
#	.github/workflows/windows-ci.yml
@mergify mergify bot mentioned this pull request Oct 6, 2023
Closed
mergify bot pushed a commit that referenced this pull request Oct 6, 2023
@EduPonz @mergify
Fix Github windows CI (#3887)
f514f0e 
* Refs #19490: Fix nightly windows CI

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #19490: Look for OpenSSL directory in several places

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #19490: Fix Fast DDS branch selection

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #19490: Defer to master if cannot find repos

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #19490: Apply Miguel's suggestions

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

---------

Signed-off-by: EduPonz <eduardoponz@eprosima.com>
(cherry picked from commit 7057142)

# Conflicts:
#	.github/workflows/config/default_ci_master.repos
#	.github/workflows/config/nightly_master.repos
#	.github/workflows/nightly-windows-ci.yml
#	.github/workflows/reusable-windows-ci.yml
#	.github/workflows/windows-ci.yml
@mergify mergify bot mentioned this pull request Oct 6, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MiguelCompany MiguelCompany MiguelCompany approved these changes

Assignees
No one assigned
Labels
ci-pending PR which CI is running
Projects
None yet
Milestone
v2.12.0
Development

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