Skip to content

Commit

Permalink
Fix Github Windows CI (#3616)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
2 people authored and MiguelCompany committed Jan 10, 2024
1 parent 5541897 commit 7cb1f93
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -203,12 +203,19 @@ def run(args):
sub_proc.kill()
pub_proc.kill()
[ds_proc.kill() for ds_proc in ds_procs]
sys.exit(os.EX_SOFTWARE)
try:
sys.exit(os.EX_SOFTWARE)
except AttributeError:
sys.exit(1)


pub_proc.kill()
ds_proc.kill()
[ds_proc.kill() for ds_proc in ds_procs]
sys.exit(os.EX_OK)
try:
sys.exit(os.EX_OK)
except AttributeError:
sys.exit(0)


if __name__ == '__main__':
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -202,12 +202,18 @@ def run(args):
sub_proc.kill()
pub_proc.kill()
ds_proc.kill()
sys.exit(os.EX_SOFTWARE)
try:
sys.exit(os.EX_SOFTWARE)
except AttributeError:
sys.exit(1)

pub_proc.kill()
ds_proc.kill()

sys.exit(os.EX_OK)
try:
sys.exit(os.EX_OK)
except AttributeError:
sys.exit(0)


if __name__ == '__main__':
Expand Down

0 comments on commit 7cb1f93

Please sign in to comment.