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

CI & cmake changes #263

Merged
merged 21 commits into from
Sep 24, 2023
Merged

CI & cmake changes #263

merged 21 commits into from
Sep 24, 2023

Conversation

qnfm
Copy link
Contributor

@qnfm qnfm commented Sep 22, 2023

Fully implement CI jobs for building under VS environment
Align the cmake test file with the VS generator.

NB: The ci change in this commit rely on my pr branch #256. I'm not sure whether should I make pr directly or just wait upstream to merged #256 then make this pr.

@qnfm qnfm requested a review from baentsch as a code owner September 22, 2023 17:48
test/CMakeLists.txt Outdated Show resolved Hide resolved
Copy link
Member

@baentsch baentsch left a comment

Choose a reason for hiding this comment

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

NB: The ci change in this commit rely on my pr branch #256. I'm not sure whether should I make pr directly or just wait upstream to merged #256 then make this pr.

I'm not quite sure what you mean: Does #263 add to & improve the changes in #256? If so, we could simply close #256 and only merge #263, right? I was holding back #256 because of your final comment "Not final solution".

Otherwise things LGTM with two single comments where I'd appreciate feedback to properly understand things. Also waiting for CI to complete. Thanks very much for this work!

@qnfm
Copy link
Contributor Author

qnfm commented Sep 22, 2023

NB: The ci change in this commit rely on my pr branch #256. I'm not sure whether should I make pr directly or just wait upstream to merged #256 then make this pr.

I'm not quite sure what you mean: Does #263 add to & improve the changes in #256? If so, we could simply close #256 and only merge #263, right? I was holding back #256 because of your final comment "Not final solution".

Otherwise things LGTM with two single comments where I'd appreciate feedback to properly understand things. Also waiting for CI to complete. Thanks very much for this work!

Yes. I will replace the lines +238 to +241 myself

@qnfm qnfm closed this Sep 22, 2023
@qnfm qnfm reopened this Sep 22, 2023
Copy link
Member

@baentsch baentsch left a comment

Choose a reason for hiding this comment

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

Thanks for the contribution!

@baentsch baentsch merged commit 9d4faab into open-quantum-safe:main Sep 24, 2023
feventura pushed a commit to EntrustCorporation/oqs-provider that referenced this pull request Mar 13, 2024
* Fix OQS_ADDL_SOCKET_LIBS setting for cmake

* Test Windows 2019 with VS 16 2019

* Add path for VS

* Avoid openssl cache conflict

* Add build type into matrix

---------

Co-authored-by: a <a@cre.es>
Signed-off-by: Felipe Ventura <felipe.ventura@entrust.com>
feventura pushed a commit to EntrustCorporation/oqs-provider that referenced this pull request Mar 16, 2024
* Fix OQS_ADDL_SOCKET_LIBS setting for cmake

* Test Windows 2019 with VS 16 2019

* Add path for VS

* Avoid openssl cache conflict

* Add build type into matrix

---------

Co-authored-by: a <a@cre.es>
Signed-off-by: Felipe Ventura <felipe.ventura@entrust.com>
feventura pushed a commit to EntrustCorporation/oqs-provider that referenced this pull request Mar 16, 2024
* Fix OQS_ADDL_SOCKET_LIBS setting for cmake

* Test Windows 2019 with VS 16 2019

* Add path for VS

* Avoid openssl cache conflict

* Add build type into matrix

---------

Co-authored-by: a <a@cre.es>
feventura pushed a commit to EntrustCorporation/oqs-provider that referenced this pull request Mar 17, 2024
* Fix OQS_ADDL_SOCKET_LIBS setting for cmake

* Test Windows 2019 with VS 16 2019

* Add path for VS

* Avoid openssl cache conflict

* Add build type into matrix

---------

Co-authored-by: a <a@cre.es>
Signed-off-by: Felipe Ventura <felipe.ventura@entrust.com>
feventura pushed a commit to EntrustCorporation/oqs-provider that referenced this pull request Mar 17, 2024
* Fix OQS_ADDL_SOCKET_LIBS setting for cmake

* Test Windows 2019 with VS 16 2019

* Add path for VS

* Avoid openssl cache conflict

* Add build type into matrix

---------

Co-authored-by: a <a@cre.es>
Signed-off-by: Felipe Ventura <felipe.ventura@entrust.com>
feventura pushed a commit to EntrustCorporation/oqs-provider that referenced this pull request Mar 17, 2024
* Fix OQS_ADDL_SOCKET_LIBS setting for cmake

* Test Windows 2019 with VS 16 2019

* Add path for VS

* Avoid openssl cache conflict

* Add build type into matrix

---------

Co-authored-by: a <a@cre.es>
Signed-off-by: Felipe Ventura <felipe.ventura@entrust.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants