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] Misc build scripts cleanup #2232

Merged
merged 1 commit into from
Jul 12, 2023

Conversation

marcalff
Copy link
Member

@marcalff marcalff commented Jul 12, 2023

Changes

Misc cleanup in build scripts:

  • Reworded comments for clarity
  • Do not silence warning /wd4996 on windows.

For significant contributions please make sure you have completed the following items:

  • CHANGELOG.md updated for non-trivial changes
  • Unit tests have been added
  • Changes in public API reviewed

@marcalff marcalff requested a review from a team July 12, 2023 19:46
@codecov
Copy link

codecov bot commented Jul 12, 2023

Codecov Report

❗ No coverage uploaded for pull request base (main@b3d547c). Click here to learn what that means.
The diff coverage is n/a.

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff           @@
##             main    #2232   +/-   ##
=======================================
  Coverage        ?   87.31%           
=======================================
  Files           ?      169           
  Lines           ?     4900           
  Branches        ?        0           
=======================================
  Hits            ?     4278           
  Misses          ?      622           
  Partials        ?        0           

@marcalff marcalff changed the title [BUILD] Misc cleanup [CI] Misc build scripts cleanup Jul 12, 2023
@marcalff
Copy link
Member Author

Ready for review.

if(BUILD_TESTING)
if(MSVC)
# Warning as error: warning STL4036: <ciso646> is removed in C++20
add_compile_options(/wd4996)
Copy link
Contributor

Choose a reason for hiding this comment

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

Why is this option no longer needed?

Copy link
Member Author

@marcalff marcalff Jul 12, 2023

Choose a reason for hiding this comment

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

The opentelemetry-cpp code does not even include header ciso464, and the build passes in maintainer mode on windows without the option, even when tests are compiled, with the dependency in GTest.

PR#2114 added this, but I think it was not needed.

This fix corrects it, and resolves your comment:

https://github.com/open-telemetry/opentelemetry-cpp/pull/2114/files#r1260156709

@ThomsonTan ThomsonTan merged commit bc23e6a into open-telemetry:main Jul 12, 2023
42 checks passed
@marcalff marcalff deleted the fix_misc_cleanup branch October 27, 2023 10:20
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.

3 participants