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

Fix cppstd_compat migration for 2.12 #17647

Merged

Conversation

AbrilRBS
Copy link
Member

@AbrilRBS AbrilRBS commented Jan 27, 2025

Changelog: Bugfix: Avoid compatibility.py migration if any of the files are modified by users.
Docs: Omit

@AbrilRBS AbrilRBS requested review from jcar87 and memsharded January 27, 2025 17:57
@AbrilRBS AbrilRBS changed the title Ar/fix cppstd compat migration 2.12 Fix cppstd_compat migration for 2.12 Jan 27, 2025
@AbrilRBS AbrilRBS marked this pull request as ready for review January 27, 2025 17:58
conan/api/subapi/config.py Outdated Show resolved Hide resolved
Copy link
Member Author

@AbrilRBS AbrilRBS left a comment

Choose a reason for hiding this comment

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

Hopefully I'm not missing anything

@memsharded memsharded added this to the 2.12.1 milestone Jan 27, 2025
@jcar87
Copy link
Contributor

jcar87 commented Jan 28, 2025

warning if changes were made to that file

I may be missing this in the PR diff - but can't see in which situation / what warning is shown?

@memsharded
Copy link
Member

I may be missing this in the PR diff - but can't see in which situation / what warning is shown?

There are no longer user changes that are not respected, so the warning is no longer necessary. That was intended for the initial case that the migration would be happening, without causing breakages, but some user custom changes to the cppstd_compat file only were not being used anymore. This no longer happens, and if the user has any changes to any of the files, they will always be respected.

@jcar87
Copy link
Contributor

jcar87 commented Jan 28, 2025

I may be missing this in the PR diff - but can't see in which situation / what warning is shown?

There are no longer user changes that are not respected, so the warning is no longer necessary. That was intended for the initial case that the migration would be happening, without causing breakages, but some user custom changes to the cppstd_compat file only were not being used anymore. This no longer happens, and if the user has any changes to any of the files, they will always be respected.

If pre-2.12 a user has modified either of the two files (even if one was modified and the other was still the original Conan one) - then a 2.12 upgrade will not touch any of the files?
This makes sense - just double checking

@czoido czoido merged commit bd03e22 into conan-io:release/2.12 Jan 28, 2025
33 checks passed
@AbrilRBS AbrilRBS deleted the ar/fix-cppstd-compat-migration-2.12 branch January 28, 2025 11:40
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.

4 participants