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

[20022] Fix Github Windows CI (backport #3616) #4227

Merged
merged 1 commit into from
Jan 10, 2024
Merged

[20022] Fix Github Windows CI (backport #3616) #4227

merged 1 commit into from
Jan 10, 2024

Conversation

MiguelCompany
Copy link
Member

@MiguelCompany MiguelCompany commented Jan 10, 2024 •
edited by JesusPoderoso
Loading

Description

PR #3616 was not backported into 2.6.x because secure discovery server feature had not been backported.

Now that it has (commit 4f53410), the Windows github action is failing with a python exception that was fixed by #3616.

This PR backports that fix by cherry-picking 802f224

Contributor Checklist

  • N/A 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.
  • Changes are ABI compatible.
  • 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.
  • 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.

@EduPonz @MiguelCompany
Fix Github Windows CI (#3616)
7cb1f93 
* Refs #19014: Fix windows exception

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

* Refs #19014: Run github windows CI with security

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

* Refs #19014: Fix secure_ds_pubsub_secure_crypto_communication.py

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

* Refs #19014: Exit with 0 it EX_OK does not exist

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

* Refs #19014: adding softhsm2-util to path

Signed-off-by: Miguel Barro <miguelbarro@eprosima.com>

* Refs #19014: Correctly propagate path between steps

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

* Refs #19014: Check softhsm with --help option

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

* Refs #19014. Add SOFTHSM2_CONF to fix softhsm2 operation

Signed-off-by: Miguel Barro <miguelbarro@eprosima.com>

---------

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
Signed-off-by: Miguel Barro <miguelbarro@eprosima.com>
Co-authored-by: Miguel Barro <miguelbarro@eprosima.com>
@MiguelCompany MiguelCompany added this to the v2.6.7 milestone Jan 10, 2024
@MiguelCompany MiguelCompany added the ci-pending PR which CI is running label Jan 10, 2024
@EduPonz EduPonz merged commit 88fb8e8 into 2.6.x Jan 10, 2024
12 of 14 checks passed
@EduPonz EduPonz deleted the backport/pr-3616/2.6.x branch January 10, 2024 13:38
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
No one assigned
Labels
ci-pending PR which CI is running
Projects
None yet
Milestone
v2.6.7
Development

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